Merge branch '2.6' into 2.7

fabpot · fabpot · commit 7ae8d1f7bfb0 · 2015-04-10T09:19:44.000+02:00
* 2.6: [Translator] Cache does not take fallback locales into consideration [VarDumper] Fix call site detection [Process] Fix volatile test Remove some useless @group annotations Removed useless strtolower call [Validator] Use strict comparisons in loaders CS: Use "self" keyword instead of class name if possible Conflicts: .travis.yml src/Symfony/Component/Translation/Translator.php
diff --git a/Tests/Functional/FragmentTest.php b/Tests/Functional/FragmentTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class FragmentTest extends WebTestCase
 {
     /**
diff --git a/Tests/Functional/ProfilerTest.php b/Tests/Functional/ProfilerTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class ProfilerTest extends WebTestCase
 {
     /**
diff --git a/Tests/Functional/SessionTest.php b/Tests/Functional/SessionTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class SessionTest extends WebTestCase
 {
     /**
diff --git a/Tests/Functional/SubRequestsTest.php b/Tests/Functional/SubRequestsTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class SubRequestsTest extends WebTestCase
 {
     public function testStateAfterSubRequest()

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;`
`13`	`13`
`14`		`-/**`
`15`		`- * @group functional`
`16`		`- */`
`17`	`14`	`class FragmentTest extends WebTestCase`
`18`	`15`	`{`
`19`	`16`	`/**`