fix merge

nicolas-grekas · nicolas-grekas · commit e71c4f71f54f · 2017-10-10T12:05:53.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php
@@ -13,6 +13,8 @@
 
 use Symfony\Bug\NotExistClass;
 
-class OptionalServiceClass extends NotExistClass
-{
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class OptionalServiceClass extends NotExistClass
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`use Symfony\Bug\NotExistClass;`
`15`	`15`
`16`		`-class OptionalServiceClass extends NotExistClass`
`17`		`-{`
	`16`	`+if (!function_exists('__phpunit_run_isolated_test')) {`
	`17`	`+ class OptionalServiceClass extends NotExistClass`
	`18`	`+ {`
	`19`	`+ }`
`18`	`20`	`}`