fix merge

symfony · Oct 10, 2017 · e71c4f7 · e71c4f7
1 parent d7b3a62
commit e71c4f7
Showing 1 changed file with 4 additions and 2 deletions.
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
+    {
+    }
 }