Merge branch '2.6' into 2.7

fabpot · fabpot · commit d223d616aa14 · 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/FinderTest.php b/Tests/FinderTest.php
@@ -132,8 +132,6 @@ public function testNotName($adapter)
 
     /**
      * @dataProvider getRegexNameTestData
-     *
-     * @group regexName
      */
     public function testRegexName($adapter, $regex)
     {
@@ -506,7 +504,6 @@ public function testCountWithoutIn()
 
     /**
      * @dataProvider getContainsTestData
-     * @group grep
      */
     public function testContains($adapter, $matchPatterns, $noMatchPatterns, $expected)
     {

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,6 @@ public function testNotName($adapter)`
`132`	`132`
`133`	`133`	`/**`
`134`	`134`	`* @dataProvider getRegexNameTestData`
`135`		`- *`
`136`		`- * @group regexName`
`137`	`135`	`*/`
`138`	`136`	`public function testRegexName($adapter, $regex)`
`139`	`137`	`{`
`@@ -506,7 +504,6 @@ public function testCountWithoutIn()`
`506`	`504`
`507`	`505`	`/**`
`508`	`506`	`* @dataProvider getContainsTestData`
`509`		`- * @group grep`
`510`	`507`	`*/`
`511`	`508`	`public function testContains($adapter, $matchPatterns, $noMatchPatterns, $expected)`
`512`	`509`	`{`