Merge pull request #345 from PHPCSStandards/feature/tests-fix-up-a_few-dataproviders

Tests: data set keys should match parameter names

Author: jrfnl

tests/Core/Config/ReportWidthTest.php

@@ -244,18 +244,18 @@ public function testReportWidthInputHandlingForAuto()
     /**
      * Test that the report width will be set correctly for various types of input.
      *
-     * @param mixed $input    Input value received.
+     * @param mixed $value    Input value received.
      * @param int   $expected Expected report width.
      *
      * @dataProvider dataReportWidthInputHandling
      * @covers       \PHP_CodeSniffer\Config::__set
      *
      * @return void
      */
-    public function testReportWidthInputHandling($input, $expected)
+    public function testReportWidthInputHandling($value, $expected)
     {
         $config = new Config();
-        $config->reportWidth = $input;
+        $config->reportWidth = $value;
 
         $this->assertSame($expected, $config->reportWidth);
 

tests/Core/ErrorSuppressionTest.php

@@ -730,9 +730,9 @@ public static function dataSuppressFile()
     {
         return [
             'no suppression'                                          => [
-                'before'         => '',
-                'after'          => '',
-                'expectedErrors' => 1,
+                'before'           => '',
+                'after'            => '',
+                'expectedWarnings' => 1,
             ],
 
             // Process with suppression.

tests/Core/File/IsReferenceTest.php

@@ -36,16 +36,16 @@ public function testNotBitwiseAndToken()
     /**
      * Test correctly identifying whether a "bitwise and" token is a reference or not.
      *
-     * @param string $identifier Comment which precedes the test case.
+     * @param string $testMarker Comment which precedes the test case.
      * @param bool   $expected   Expected function output.
      *
      * @dataProvider dataIsReference
      *
      * @return void
      */
-    public function testIsReference($identifier, $expected)
+    public function testIsReference($testMarker, $expected)
     {
-        $bitwiseAnd = $this->getTargetToken($identifier, T_BITWISE_AND);
+        $bitwiseAnd = $this->getTargetToken($testMarker, T_BITWISE_AND);
         $result     = self::$phpcsFile->isReference($bitwiseAnd);
         $this->assertSame($expected, $result);