fix merge

nicolas-grekas · nicolas-grekas · commit 659561525584 · 2017-10-10T12:32:49.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -168,6 +168,9 @@ public function testGetFlashesWithNoRequest()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashesWithNoSessionStarted()
     {
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
@@ -178,6 +181,9 @@ public function testGetFlashesWithNoSessionStarted()
         $this->assertEquals(array(), $this->appVariable->getFlashes());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testGetFlashes()
     {
         $flashMessages = $this->setFlashMessages();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php
@@ -2,7 +2,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation;
 
-class Article implements NotExistingInterface
-{
-    public $category;
+if (!function_exists('__phpunit_run_isolated_test')) {
+    class Article implements NotExistingInterface
+    {
+        public $category;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,9 @@ public function testGetFlashesWithNoRequest()`
`168`	`168`	`$this->assertEquals(array(), $this->appVariable->getFlashes());`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ /**`
	`172`	`+ * @runInSeparateProcess`
	`173`	`+ */`
`171`	`174`	`public function testGetFlashesWithNoSessionStarted()`
`172`	`175`	`{`
`173`	`176`	`$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();`
`@@ -178,6 +181,9 @@ public function testGetFlashesWithNoSessionStarted()`
`178`	`181`	`$this->assertEquals(array(), $this->appVariable->getFlashes());`
`179`	`182`	`}`
`180`	`183`
	`184`	`+ /**`
	`185`	`+ * @runInSeparateProcess`
	`186`	`+ */`
`181`	`187`	`public function testGetFlashes()`
`182`	`188`	`{`
`183`	`189`	`$flashMessages = $this->setFlashMessages();`