Skip to content

Commit f2fc7bf

Browse files
Merge branch '2.8' into 3.3
* 2.8: Remove function_exists(__phpunit_run_isolated_test) checks
2 parents a3d398e + c23adae commit f2fc7bf

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
44

5-
if (!function_exists('__phpunit_run_isolated_test')) {
6-
class Article implements NotExistingInterface
7-
{
8-
public $category;
9-
}
5+
class Article implements NotExistingInterface
6+
{
7+
public $category;
108
}

src/Symfony/Component/Config/Tests/Fixtures/BadParent.php

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

33
namespace Symfony\Component\Config\Tests\Fixtures;
44

5-
if (!function_exists('__phpunit_run_isolated_test')) {
6-
class BadParent extends MissingParent
7-
{
8-
}
5+
class BadParent extends MissingParent
6+
{
97
}
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)