fix merge

src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

@@ -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();

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;
+    }
 }