Merge branch '2.6' into 2.7

fabpot · fabpot · commit 4888ea767343 · 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/CsrfFormLoginTest.php b/Tests/Functional/CsrfFormLoginTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class CsrfFormLoginTest extends WebTestCase
 {
     /**
diff --git a/Tests/Functional/FirewallEntryPointTest.php b/Tests/Functional/FirewallEntryPointTest.php
@@ -13,9 +13,6 @@
 
 use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPointBundle\Security\EntryPointStub;
 
-/**
- * @group functional
- */
 class FirewallEntryPointTest extends WebTestCase
 {
     public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials()
diff --git a/Tests/Functional/FormLoginTest.php b/Tests/Functional/FormLoginTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class FormLoginTest extends WebTestCase
 {
     /**
diff --git a/Tests/Functional/SecurityRoutingIntegrationTest.php b/Tests/Functional/SecurityRoutingIntegrationTest.php
@@ -57,7 +57,6 @@ public function testRoutingErrorIsNotExposedForProtectedResourceWhenLoggedInWith
 
     /**
      * @dataProvider getConfigs
-     * @group ip_whitelist
      */
     public function testSecurityConfigurationForSingleIPAddress($config)
     {
@@ -70,7 +69,6 @@ public function testSecurityConfigurationForSingleIPAddress($config)
 
     /**
      * @dataProvider getConfigs
-     * @group ip_whitelist
      */
     public function testSecurityConfigurationForMultipleIPAddresses($config)
     {
diff --git a/Tests/Functional/SwitchUserTest.php b/Tests/Functional/SwitchUserTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
-/**
- * @group functional
- */
 class SwitchUserTest extends WebTestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\SecurityBundle\Tests\Functional;`
`13`	`13`
`14`		`-/**`
`15`		`- * @group functional`
`16`		`- */`
`17`	`14`	`class CsrfFormLoginTest extends WebTestCase`
`18`	`15`	`{`
`19`	`16`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`
`14`	`14`	`use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPointBundle\Security\EntryPointStub;`
`15`	`15`
`16`		`-/**`
`17`		`- * @group functional`
`18`		`- */`
`19`	`16`	`class FirewallEntryPointTest extends WebTestCase`
`20`	`17`	`{`
`21`	`18`	`public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials()`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ public function testRoutingErrorIsNotExposedForProtectedResourceWhenLoggedInWith`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* @dataProvider getConfigs`
`60`		`- * @group ip_whitelist`
`61`	`60`	`*/`
`62`	`61`	`public function testSecurityConfigurationForSingleIPAddress($config)`
`63`	`62`	`{`
`@@ -70,7 +69,6 @@ public function testSecurityConfigurationForSingleIPAddress($config)`
`70`	`69`
`71`	`70`	`/**`
`72`	`71`	`* @dataProvider getConfigs`
`73`		`- * @group ip_whitelist`
`74`	`72`	`*/`
`75`	`73`	`public function testSecurityConfigurationForMultipleIPAddresses($config)`
`76`	`74`	`{`