Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 07bdd592908c · 2017-11-19T22:09:36.000+02:00
* 3.3:
  [Bridge/PhpUnit] Fix compat with phpunit 4.8 &amp; bridge &lt;=3.3.13
  Remove function_exists(__phpunit_run_isolated_test) checks
diff --git a/Tests/Compiler/OptionalServiceClass.php b/Tests/Compiler/OptionalServiceClass.php
@@ -13,8 +13,6 @@
 
 use Symfony\Bug\NotExistClass;
 
-if (!function_exists('__phpunit_run_isolated_test')) {
-    class OptionalServiceClass extends NotExistClass
-    {
-    }
+class OptionalServiceClass extends NotExistClass
+{
 }

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