fix merge
This commit is contained in:
parent
01c50eb070
commit
6595615255
@ -168,6 +168,9 @@ class AppVariableTest extends TestCase
|
||||
$this->assertEquals(array(), $this->appVariable->getFlashes());
|
||||
}
|
||||
|
||||
/**
|
||||
* @runInSeparateProcess
|
||||
*/
|
||||
public function testGetFlashesWithNoSessionStarted()
|
||||
{
|
||||
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
|
||||
@ -178,6 +181,9 @@ class AppVariableTest extends TestCase
|
||||
$this->assertEquals(array(), $this->appVariable->getFlashes());
|
||||
}
|
||||
|
||||
/**
|
||||
* @runInSeparateProcess
|
||||
*/
|
||||
public function testGetFlashes()
|
||||
{
|
||||
$flashMessages = $this->setFlashMessages();
|
||||
|
@ -2,7 +2,9 @@
|
||||
|
||||
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
|
||||
|
||||
class Article implements NotExistingInterface
|
||||
{
|
||||
if (!function_exists('__phpunit_run_isolated_test')) {
|
||||
class Article implements NotExistingInterface
|
||||
{
|
||||
public $category;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user