Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit a35edc277513 · 2016-08-05T10:37:39.000+02:00
* 2.8:
  Relax 1 test failing with latest PHP versions
  bumped Symfony version to 2.8.10
  Remove usage of __CLASS__ outside of a class
  [HttpKernel] Fix variable conflicting name
  [Process] Fix double-fread() when reading unix pipes
  [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least)
  [Validator] Fix dockblock typehint in XmlFileLoader
  bumped Symfony version to 2.8.10
  updated VERSION for 2.8.9
  updated CHANGELOG for 2.8.9
  bumped Symfony version to 2.7.17
  updated VERSION for 2.7.16
  update CONTRIBUTORS for 2.7.16
  updated CHANGELOG for 2.7.16
  Minor fixes
  [Console] Overcomplete argument exception message tweak.
  fixed bad auto merge
  Console table cleanup
  undefined offset fix (#19406)
  [EventDispatcher] Removed unused variable

Conflicts:
	CHANGELOG-2.7.md
	CHANGELOG-3.0.md
	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
	src/Symfony/Component/Console/Tests/Helper/TableTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
	src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Tests/PluralizationRulesTest.php b/Tests/PluralizationRulesTest.php
@@ -37,7 +37,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase
      */
     public function testFailedLangcodes($nplural, $langCodes)
     {
-        $matrix = $this->generateTestData($nplural, $langCodes);
+        $matrix = $this->generateTestData($langCodes);
         $this->validateMatrix($nplural, $matrix, false);
     }
 
@@ -46,7 +46,7 @@ public function testFailedLangcodes($nplural, $langCodes)
      */
     public function testLangcodes($nplural, $langCodes)
     {
-        $matrix = $this->generateTestData($nplural, $langCodes);
+        $matrix = $this->generateTestData($langCodes);
         $this->validateMatrix($nplural, $matrix);
     }
 
@@ -108,7 +108,7 @@ protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
         }
     }
 
-    protected function generateTestData($plural, $langCodes)
+    protected function generateTestData($langCodes)
     {
         $matrix = array();
         foreach ($langCodes as $langCode) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase`
`37`	`37`	`*/`
`38`	`38`	`public function testFailedLangcodes($nplural, $langCodes)`
`39`	`39`	`{`
`40`		`- $matrix = $this->generateTestData($nplural, $langCodes);`
	`40`	`+ $matrix = $this->generateTestData($langCodes);`
`41`	`41`	`$this->validateMatrix($nplural, $matrix, false);`
`42`	`42`	`}`
`43`	`43`
`@@ -46,7 +46,7 @@ public function testFailedLangcodes($nplural, $langCodes)`
`46`	`46`	`*/`
`47`	`47`	`public function testLangcodes($nplural, $langCodes)`
`48`	`48`	`{`
`49`		`- $matrix = $this->generateTestData($nplural, $langCodes);`
	`49`	`+ $matrix = $this->generateTestData($langCodes);`
`50`	`50`	`$this->validateMatrix($nplural, $matrix);`
`51`	`51`	`}`
`52`	`52`
`@@ -108,7 +108,7 @@ protected function validateMatrix($nplural, $matrix, $expectSuccess = true)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- protected function generateTestData($plural, $langCodes)`
	`111`	`+ protected function generateTestData($langCodes)`
`112`	`112`	`{`
`113`	`113`	`$matrix = array();`
`114`	`114`	`foreach ($langCodes as $langCode) {`