minor PHP-CS-Fixer#2368 clean ups (SpacePossum, localheinz)

This PR was merged into the 2.0-dev branch.

Discussion
----------

clean ups

Commits
-------

e1868d4 Enhancement: Assert that InvalidConfigurationException is thrown for unknown configuration key
27e35fe clean ups

Author: keradus

src/Fixer/ClassNotation/ProtectedToPrivateFixer.php

@@ -46,7 +46,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens)
             $classClose = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $classOpen);
 
             if (!$this->skipClass($tokens, $index, $classOpen, $classClose)) {
-                $this->fixClass($tokens, $index, $classOpen, $classClose);
+                $this->fixClass($tokens, $classOpen, $classClose);
             }
 
             $index = $classClose;
@@ -69,11 +69,10 @@ protected function getDescription()
 
     /**
      * @param Tokens $tokens
-     * @param int    $classIndex
      * @param int    $classOpenIndex
      * @param int    $classCloseIndex
      */
-    private function fixClass(Tokens $tokens, $classIndex, $classOpenIndex, $classCloseIndex)
+    private function fixClass(Tokens $tokens, $classOpenIndex, $classCloseIndex)
     {
         for ($index = $classOpenIndex + 1; $index < $classCloseIndex; ++$index) {
             if ($tokens[$index]->equals('{')) {

src/Fixer/Phpdoc/PhpdocAddMissingParamAnnotationFixer.php

@@ -13,6 +13,7 @@
 namespace PhpCsFixer\Fixer\Phpdoc;
 
 use PhpCsFixer\AbstractFunctionReferenceFixer;
+use PhpCsFixer\ConfigurationException\InvalidFixerConfigurationException;
 use PhpCsFixer\DocBlock\DocBlock;
 use PhpCsFixer\DocBlock\Line;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
@@ -215,7 +216,6 @@ private function prepareArgumentInformation(Tokens $tokens, $start, $end)
         );
 
         $sawName = false;
-        $sawEq = false;
 
         for ($index = $start; $index <= $end; ++$index) {
             $token = $tokens[$index];
@@ -232,8 +232,6 @@ private function prepareArgumentInformation(Tokens $tokens, $start, $end)
             }
 
             if ($token->equals('=')) {
-                $sawEq = true;
-
                 continue;
             }
 

src/Fixer/Phpdoc/PhpdocToCommentFixer.php

@@ -77,7 +77,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens)
                 continue;
             }
 
-            if ($nextToken->isGivenKind(T_VARIABLE) && $this->isValidVariable($tokens, $token, $nextIndex)) {
+            if ($nextToken->isGivenKind(T_VARIABLE) && $this->isValidVariable($tokens, $nextIndex)) {
                 continue;
             }
 
@@ -195,12 +195,11 @@ private function isValidList(Tokens $tokens, Token $docsToken, $listIndex)
      * Checks variable assignments for correct docblock usage.
      *
      * @param Tokens $tokens
-     * @param Token  $docsToken     docs Token
      * @param int    $variableIndex index of variable Token
      *
      * @return bool
      */
-    private function isValidVariable(Tokens $tokens, Token $docsToken, $variableIndex)
+    private function isValidVariable(Tokens $tokens, $variableIndex)
     {
         $nextIndex = $tokens->getNextMeaningfulToken($variableIndex);
 

src/Test/AbstractIntegrationTestCase.php

@@ -65,6 +65,9 @@ abstract class AbstractIntegrationTestCase extends \PHPUnit_Framework_TestCase
      */
     protected $linter;
 
+    /**
+     * @var FileRemoval
+     */
     private static $fileRemoval;
 
     public static function setUpBeforeClass()

src/Tokenizer/Transformer/SquareBraceTransformer.php

@@ -65,7 +65,7 @@ public function process(Tokens $tokens, Token $token, $index)
         $this->transformIntoArraySquareBrace($tokens, $token, $index);
 
         if (PHP_VERSION_ID >= 70100) {
-            $this->transformIntoDestructuringSquareBrace($tokens, $token, $index);
+            $this->transformIntoDestructuringSquareBrace($tokens, $token);
         }
     }
 
@@ -83,7 +83,7 @@ private function transformIntoArraySquareBrace(Tokens $tokens, Token $token, $in
         $this->cacheOfArraySquareBraceCloseIndex = $endIndex;
     }
 
-    private function transformIntoDestructuringSquareBrace(Tokens $tokens, Token $token, $index)
+    private function transformIntoDestructuringSquareBrace(Tokens $tokens, Token $token)
     {
         if (
             null === $this->cacheOfArraySquareBraceCloseIndex

tests/Fixer/Phpdoc/PhpdocAddMissingParamAnnotationFixerTest.php

@@ -22,6 +22,51 @@
  */
 final class PhpdocAddMissingParamAnnotationFixerTest extends AbstractFixerTestCase
 {
+    public function testConfigureRejectsUnknownConfigurationKey()
+    {
+        $key = 'foo';
+
+        $this->setExpectedException('PhpCsFixer\ConfigurationException\InvalidConfigurationException', sprintf(
+            '"%s" is not handled by the fixer.',
+            $key
+        ));
+
+        $this->fixer->configure(array(
+            $key => 'bar',
+        ));
+    }
+
+    /**
+     * @dataProvider providerInvalidConfigurationValue
+     *
+     * @param mixed $value
+     */
+    public function testConfigureRejectsInvalidConfigurationValue($value)
+    {
+        $this->setExpectedException('PhpCsFixer\ConfigurationException\InvalidConfigurationException', sprintf(
+            'Expected boolean got "%s".',
+            is_object($value) ? get_class($value) : gettype($value)
+        ));
+
+        $this->fixer->configure(array(
+            'only_untyped' => $value,
+        ));
+    }
+
+    /**
+     * @return array
+     */
+    public function providerInvalidConfigurationValue()
+    {
+        return array(
+            'null' => array(null),
+            'int' => array(1),
+            'array' => array(array()),
+            'float' => array(0.1),
+            'object' => array(new \stdClass()),
+        );
+    }
+
     /**
      * @param string      $expected
      * @param null|string $input