minor #5518 DX: minor typing and validation fixes (keradus)

This PR was merged into the 2.18 branch. Discussion ---------- DX: minor typing and validation fixes Commits ------- c39900d DX: minor typing and validation fixes
PHP-CS-Fixer · Mar 1, 2021 · c73f1b8 · c73f1b8
2 parents c244b07 + c39900d
commit c73f1b8
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 34 deletions.
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -12,6 +12,8 @@
 
 namespace PhpCsFixer\RuleSet;
 
+use PhpCsFixer\ConfigurationException\InvalidFixerConfigurationException;
+
 /**
  * Set of rules to be used by fixer.
  *
@@ -41,6 +43,10 @@ public function __construct(array $set = [])
             if (\is_int($key)) {
                 throw new \InvalidArgumentException(sprintf('Missing value for "%s" rule/set.', $value));
             }
+
+            if (true !== $value && false !== $value && !\is_array($value)) {
+                throw new InvalidFixerConfigurationException($key, 'Configuration must be an array and may not be empty.');
+            }
         }
 
         $this->resolveSet($set);

diff --git a/tests/Console/ConfigurationResolverTest.php b/tests/Console/ConfigurationResolverTest.php
@@ -231,7 +231,7 @@ public function testResolveConfigFileChooseFile($expectedFile, $expectedClass, $
         $resolver = $this->createConfigurationResolver(
             ['path' => [$path]],
             null,
-            $cwdPath
+            $cwdPath ?: ''
         );
 
         static::assertSame($expectedFile, $resolver->getConfigFile());

diff --git a/tests/DocBlock/ShortDescriptionTest.php b/tests/DocBlock/ShortDescriptionTest.php
@@ -24,12 +24,12 @@
 final class ShortDescriptionTest extends TestCase
 {
     /**
-     * @param mixed      $expected
-     * @param null|mixed $input
+     * @param null|int $expected
+     * @param string   $input
      *
      * @dataProvider provideGetEndCases
      */
-    public function testGetEnd($expected, $input = null)
+    public function testGetEnd($expected, $input)
     {
         $doc = new DocBlock($input);
         $shortDescription = new ShortDescription($doc);

diff --git a/tests/Fixer/ControlStructure/NoAlternativeSyntaxFixerTest.php b/tests/Fixer/ControlStructure/NoAlternativeSyntaxFixerTest.php
@@ -26,8 +26,8 @@ final class NoAlternativeSyntaxFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      *
-     * @param mixed      $expected
-     * @param null|mixed $input
+     * @param string      $expected
+     * @param null|string $input
      */
     public function testFix($expected, $input = null)
     {

diff --git a/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php b/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php
@@ -38,8 +38,8 @@ public function testLegacyFix()
     }
 
     /**
-     * @param string $expected
-     * @param string $input
+     * @param string      $expected
+     * @param null|string $input
      *
      * @dataProvider provideFixCases
      */

diff --git a/tests/Fixer/Naming/NoHomoglyphNamesFixerTest.php b/tests/Fixer/Naming/NoHomoglyphNamesFixerTest.php
@@ -26,8 +26,8 @@ final class NoHomoglyphNamesFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      *
-     * @param mixed      $expected
-     * @param null|mixed $input
+     * @param string      $expected
+     * @param null|string $input
      */
     public function testFix($expected, $input = null)
     {
@@ -106,8 +106,8 @@ public function provideFixCases()
      * @dataProvider provideFix74Cases
      * @requires PHP 7.4
      *
-     * @param mixed      $expected
-     * @param null|mixed $input
+     * @param string      $expected
+     * @param null|string $input
      */
     public function testFix74($expected, $input = null)
     {

diff --git a/tests/Fixer/PhpUnit/PhpUnitInternalClassFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitInternalClassFixerTest.php
@@ -26,9 +26,9 @@ final class PhpUnitInternalClassFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      *
-     * @param string     $expected
-     * @param null|mixed $input
-     * @param array      $config
+     * @param string      $expected
+     * @param null|string $input
+     * @param array       $config
      */
     public function testFix($expected, $input = null, $config = [])
     {

diff --git a/tests/Fixer/PhpUnit/PhpUnitMethodCasingFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitMethodCasingFixerTest.php
@@ -38,8 +38,8 @@ public function testFixToCamelCase($expected, $input = null)
     /**
      * @dataProvider provideFixCases
      *
-     * @param mixed      $camelExpected
-     * @param null|mixed $camelInput
+     * @param string      $camelExpected
+     * @param null|string $camelInput
      */
     public function testFixToSnakeCase($camelExpected, $camelInput = null)
     {

diff --git a/tests/Fixer/PhpUnit/PhpUnitSizeClassFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitSizeClassFixerTest.php
@@ -26,9 +26,9 @@ final class PhpUnitSizeClassFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      *
-     * @param string     $expected
-     * @param null|mixed $input
-     * @param array      $config
+     * @param string      $expected
+     * @param null|string $input
+     * @param array       $config
      */
     public function testFix($expected, $input = null, $config = [])
     {

diff --git a/tests/Test/AbstractIntegrationCaseFactory.php b/tests/Test/AbstractIntegrationCaseFactory.php
@@ -77,7 +77,7 @@ public function create(SplFileInfo $file)
     /**
      * Parses the '--CONFIG--' block of a '.test' file.
      *
-     * @param string $config
+     * @param ?string $config
      *
      * @return array
      */
@@ -108,7 +108,7 @@ protected function determineConfig(SplFileInfo $file, $config)
     /**
      * Parses the '--REQUIREMENTS--' block of a '.test' file and determines requirements.
      *
-     * @param string $config
+     * @param ?string $config
      *
      * @return array
      */
@@ -155,7 +155,7 @@ protected function determineTitle(SplFileInfo $file, $config)
     /**
      * Parses the '--SETTINGS--' block of a '.test' file and determines settings.
      *
-     * @param string $config
+     * @param ?string $config
      *
      * @return array
      */

diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
@@ -46,11 +46,11 @@ public function testReadFromCacheAfterClearing()
     }
 
     /**
-     * @param string     $source
-     * @param Token[]    $sequence
-     * @param int        $start
-     * @param null|int   $end
-     * @param array|bool $caseSensitive
+     * @param string          $source
+     * @param Token[]         $sequence
+     * @param int             $start
+     * @param null|int        $end
+     * @param null|array|bool $caseSensitive
      *
      * @dataProvider provideFindSequenceCases
      */
@@ -210,7 +210,7 @@ public function provideFindSequenceCases()
                 ],
                 0,
                 1,
-                [1, true],
+                [1 => true],
             ],
             [
                 '<?php $x = 13;',
@@ -238,7 +238,7 @@ public function provideFindSequenceCases()
                 ],
                 0,
                 1,
-                [1, false],
+                [1 => false],
             ],
             [
                 '<?php $x = 15;',
@@ -621,7 +621,7 @@ public function provideGetClearTokenAndMergeSurroundingWhitespaceCases()
     }
 
     /**
-     * @param int  $expectedIndex
+     * @param ?int $expectedIndex
      * @param int  $direction
      * @param int  $index
      * @param bool $caseSensitive
@@ -1247,9 +1247,9 @@ public function testRemovingTrailingWhitespaceWillNotIncreaseTokensCount()
     }
 
     /**
-     * @param null|int $expected
-     * @param string   $code
-     * @param int      $index
+     * @param null|array $expected
+     * @param string     $code
+     * @param int        $index
      *
      * @dataProvider provideDetectBlockTypeCases
      */