fix merge

nicolas-grekas · nicolas-grekas · commit 9719fba0ab5f · 2017-10-10T12:34:18.000+02:00
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php b/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Component\Config\Tests\Fixtures;
 
-class BadParent extends MissingParent
-{
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class BadParent extends MissingParent
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\Config\Tests\Fixtures;`
`4`	`4`
`5`		`-class BadParent extends MissingParent`
`6`		`-{`
	`5`	`+if (!function_exists('__phpunit_run_isolated_test')) {`
	`6`	`+ class BadParent extends MissingParent`
	`7`	`+ {`
	`8`	`+ }`
`7`	`9`	`}`