Skip to content

Commit c23adae

Browse files
Merge branch '2.7' into 2.8
* 2.7: Remove function_exists(__phpunit_run_isolated_test) checks
2 parents 7215acb + 4c5d9cf commit c23adae

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
<?php
22

3-
if (!function_exists('__phpunit_run_isolated_test')) {
4-
throw new \Exception('boo');
5-
}
3+
throw new \Exception('boo');

src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
use Symfony\Bug\NotExistClass;
1515

16-
if (!function_exists('__phpunit_run_isolated_test')) {
17-
class OptionalServiceClass extends NotExistClass
18-
{
19-
}
16+
class OptionalServiceClass extends NotExistClass
17+
{
2018
}

src/Symfony/Component/Routing/Tests/Fixtures/validresource.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22

3-
if (function_exists('__phpunit_run_isolated_test')) {
4-
return;
5-
}
63
/** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
74
/** @var \Symfony\Component\Routing\RouteCollection $collection */
85
$collection = $loader->import('validpattern.php');

0 commit comments

Comments
 (0)