diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Nicolas Grekas 2017-10-10 12:32:49 +02:00
parent 01c50eb070
commit 6595615255
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
View File

@ -168,6 +168,9 @@ class AppVariableTest extends TestCase
$this->assertEquals(array(), $this->appVariable->getFlashes()); $this->assertEquals(array(), $this->appVariable->getFlashes());
} }
/**
* @runInSeparateProcess
*/
public function testGetFlashesWithNoSessionStarted() public function testGetFlashesWithNoSessionStarted()
{ {
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(); $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
@ -178,6 +181,9 @@ class AppVariableTest extends TestCase
$this->assertEquals(array(), $this->appVariable->getFlashes()); $this->assertEquals(array(), $this->appVariable->getFlashes());
} }
/**
* @runInSeparateProcess
*/
public function testGetFlashes() public function testGetFlashes()
{ {
$flashMessages = $this->setFlashMessages(); $flashMessages = $this->setFlashMessages();

8
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
View File

@ -2,7 +2,9 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation; namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
class Article implements NotExistingInterface if (!function_exists('__phpunit_run_isolated_test')) {
{ class Article implements NotExistingInterface
public $category; {
public $category;
}
} }