Merge branch '2.7' into 2.8

* 2.7:
  Remove function_exists(__phpunit_run_isolated_test) checks
This commit is contained in:
Nicolas Grekas 2017-11-19 21:03:36 +02:00
commit c23adaec43
3 changed files with 3 additions and 10 deletions

View File

@ -1,5 +1,3 @@
<?php
if (!function_exists('__phpunit_run_isolated_test')) {
throw new \Exception('boo');
}
throw new \Exception('boo');

View File

@ -13,8 +13,6 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler;
use Symfony\Bug\NotExistClass;
if (!function_exists('__phpunit_run_isolated_test')) {
class OptionalServiceClass extends NotExistClass
{
}
class OptionalServiceClass extends NotExistClass
{
}

View File

@ -1,8 +1,5 @@
<?php
if (function_exists('__phpunit_run_isolated_test')) {
return;
}
/** @var $loader \Symfony\Component\Routing\Loader\PhpFileLoader */
/** @var \Symfony\Component\Routing\RouteCollection $collection */
$collection = $loader->import('validpattern.php');