8000 Remove unnecessary changes · symfony/symfony@511faf9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 511faf9

Browse files
alexpottalexpott
committed
Remove unnecessary changes
1 parent 6a63b3f commit 511faf9

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ public function endTest($test, $time)
270270
}
271271
}
272272
$this->runsInSeparateProcess = false;
273-
putenv('SYMFONY_DEPRECATIONS_SERIALIZE=');
274273
}
275274

276275
if ($this->expectedDeprecations) {

‎src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
* @group legacy
1111
*
1212
* @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.
1913
*/
2014
class ProcessIsolationTest extends TestCase
2115
{

‎src/Symfony/Bridge/PhpUnit/bootstrap.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
1414

1515
// Detect if we're loaded by an actual run of phpunit
16-
if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
17-
DeprecationErrorHandler::collectDeprecations($ser);
16+
if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
17+
if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
18+
DeprecationErrorHandler::collectDeprecations($ser);
19+
}
1820

1921
return;
2022
}

‎src/Symfony/Bridge/PhpUnit/phpunit.xml.dist‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
</testsuite>
2020
</testsuites>
2121

22-
<listeners>
23-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
24-
</listener>
25-
</listeners>
26-
2722
<filter>
2823
<whitelist>
2924
<directory>./</directory>

0 commit comments

Comments
 (0)
0