Merge branch '2.7' into 2.8

fabpot · fabpot · commit 32b0c824da6d · 2016-07-30T03:20:35.000-04:00
* 2.7:
  Minor fixes
  [Console] Overcomplete argument exception message tweak.
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) {`