DX: further typing improvements

PHP-CS-Fixer · Mar 20, 2021 · 4e484d1 · 4e484d1
1 parent 0e8e40e
commit 4e484d1
Show file tree

Hide file tree

Showing 38 changed files with 43 additions and 43 deletions.
diff --git a/src/Cache/FileCacheManager.php b/src/Cache/FileCacheManager.php
@@ -61,7 +61,7 @@ public function __construct(
         FileHandlerInterface $handler,
         SignatureInterface $signature,
         bool $isDryRun = false,
-        DirectoryInterface $cacheDirectory = null
+        ?DirectoryInterface $cacheDirectory = null
     ) {
         $this->handler = $handler;
         $this->signature = $signature;

diff --git a/src/Console/Command/DescribeCommand.php b/src/Console/Command/DescribeCommand.php
@@ -64,7 +64,7 @@ final class DescribeCommand extends Command
      */
     private $fixers;
 
-    public function __construct(FixerFactory $fixerFactory = null)
+    public function __construct(?FixerFactory $fixerFactory = null)
     {
         parent::__construct();
 

diff --git a/src/Differ/DifferInterface.php b/src/Differ/DifferInterface.php
@@ -22,5 +22,5 @@ interface DifferInterface
     /**
      * Create diff.
      */
-    public function diff(string $old, string $new, \SplFileInfo $file = null): string;
+    public function diff(string $old, string $new, ?\SplFileInfo $file = null): string;
 }
diff --git a/src/Differ/FullDiffer.php b/src/Differ/FullDiffer.php
@@ -43,7 +43,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function diff(string $old, string $new, \SplFileInfo $file = null): string
+    public function diff(string $old, string $new, ?\SplFileInfo $file = null): string
     {
         return $this->differ->diff($old, $new);
     }

diff --git a/src/Differ/NullDiffer.php b/src/Differ/NullDiffer.php
@@ -22,7 +22,7 @@ final class NullDiffer implements DifferInterface
     /**
      * {@inheritdoc}
      */
-    public function diff(string $old, string $new, \SplFileInfo $file = null): string
+    public function diff(string $old, string $new, ?\SplFileInfo $file = null): string
     {
         return '';
     }

diff --git a/src/Differ/UnifiedDiffer.php b/src/Differ/UnifiedDiffer.php
@@ -26,7 +26,7 @@ final class UnifiedDiffer implements DifferInterface
     /**
      * {@inheritdoc}
      */
-    public function diff(string $old, string $new, \SplFileInfo $file = null): string
+    public function diff(string $old, string $new, ?\SplFileInfo $file = null): string
     {
         if (null === $file) {
             $options = [

diff --git a/src/Fixer/Alias/NoAliasFunctionsFixer.php b/src/Fixer/Alias/NoAliasFunctionsFixer.php
@@ -99,7 +99,7 @@ final class NoAliasFunctionsFixer extends AbstractFixer implements ConfigurableF
         'gmmktime' => ['time', 0],
     ];
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Basic/PsrAutoloadingFixer.php b/src/Fixer/Basic/PsrAutoloadingFixer.php
@@ -68,7 +68,7 @@ class InvalidName {}
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Casing/ConstantCaseFixer.php b/src/Fixer/Casing/ConstantCaseFixer.php
@@ -43,7 +43,7 @@ final class ConstantCaseFixer extends AbstractFixer implements ConfigurableFixer
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Casing/NativeFunctionTypeDeclarationCasingFixer.php b/src/Fixer/Casing/NativeFunctionTypeDeclarationCasingFixer.php
@@ -160,7 +160,7 @@ private function fixFunctionReturnType(Tokens $tokens, int $index): void
         $this->fixArgumentType($tokens, $this->functionsAnalyzer->getFunctionReturnType($tokens, $index));
     }
 
-    private function fixArgumentType(Tokens $tokens, TypeAnalysis $type = null): void
+    private function fixArgumentType(Tokens $tokens, ?TypeAnalysis $type = null): void
     {
         if (null === $type) {
             return;

diff --git a/src/Fixer/Comment/CommentToPhpdocFixer.php b/src/Fixer/Comment/CommentToPhpdocFixer.php
@@ -86,7 +86,7 @@ public function getDefinition(): FixerDefinitionInterface
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php b/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php
@@ -125,7 +125,7 @@ public function isRisky(): bool
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php b/src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php
@@ -109,7 +109,7 @@ public function isCandidate(Tokens $tokens): bool
         return $tokens->isTokenKindFound('(');
     }
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/FunctionNotation/NativeFunctionInvocationFixer.php b/src/Fixer/FunctionNotation/NativeFunctionInvocationFixer.php
@@ -62,7 +62,7 @@ final class NativeFunctionInvocationFixer extends AbstractFixer implements Confi
      */
     private $functionFilter;
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixer.php b/src/Fixer/LanguageConstruct/SingleSpaceAfterConstructFixer.php
@@ -105,7 +105,7 @@ final class SingleSpaceAfterConstructFixer extends AbstractFixer implements Conf
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Operator/OperatorLinebreakFixer.php b/src/Fixer/Operator/OperatorLinebreakFixer.php
@@ -85,7 +85,7 @@ function foo() {
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/PhpUnit/PhpUnitMockFixer.php b/src/Fixer/PhpUnit/PhpUnitMockFixer.php
@@ -88,7 +88,7 @@ public function isRisky(): bool
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixer.php b/src/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixer.php
@@ -44,7 +44,7 @@ final class PhpUnitNoExpectationAnnotationFixer extends AbstractPhpUnitFixer imp
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Phpdoc/PhpdocNoAliasTagFixer.php b/src/Fixer/Phpdoc/PhpdocNoAliasTagFixer.php
@@ -85,7 +85,7 @@ public function getPriority(): int
         return parent::getPriority();
     }
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Phpdoc/PhpdocTagCasingFixer.php b/src/Fixer/Phpdoc/PhpdocTagCasingFixer.php
@@ -55,7 +55,7 @@ public function getPriority(): int
         return parent::getPriority();
     }
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Phpdoc/PhpdocTypesFixer.php b/src/Fixer/Phpdoc/PhpdocTypesFixer.php
@@ -76,7 +76,7 @@ final class PhpdocTypesFixer extends AbstractPhpdocTypesFixer implements Configu
     /**
      * {@inheritdoc}
      */
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/FixerConfiguration/FixerOption.php b/src/FixerConfiguration/FixerOption.php
@@ -60,9 +60,9 @@ public function __construct(
         string $description,
         bool $isRequired = true,
         $default = null,
-        array $allowedTypes = null,
-        array $allowedValues = null,
-        \Closure $normalizer = null
+        ?array $allowedTypes = null,
+        ?array $allowedValues = null,
+        ?\Closure $normalizer = null
     ) {
         if ($isRequired && null !== $default) {
             throw new \LogicException('Required options cannot have a default value.');

diff --git a/src/FixerDefinition/CodeSample.php b/src/FixerDefinition/CodeSample.php
@@ -29,7 +29,7 @@ final class CodeSample implements CodeSampleInterface
      */
     private $configuration;
 
-    public function __construct(string $code, array $configuration = null)
+    public function __construct(string $code, ?array $configuration = null)
     {
         $this->code = $code;
         $this->configuration = $configuration;

diff --git a/src/FixerDefinition/FileSpecificCodeSample.php b/src/FixerDefinition/FileSpecificCodeSample.php
@@ -34,7 +34,7 @@ final class FileSpecificCodeSample implements FileSpecificCodeSampleInterface
     public function __construct(
         string $code,
         \SplFileInfo $splFileInfo,
-        array $configuration = null
+        ?array $configuration = null
     ) {
         $this->codeSample = new CodeSample($code, $configuration);
         $this->splFileInfo = $splFileInfo;

diff --git a/src/FixerDefinition/VersionSpecificCodeSample.php b/src/FixerDefinition/VersionSpecificCodeSample.php
@@ -32,7 +32,7 @@ final class VersionSpecificCodeSample implements VersionSpecificCodeSampleInterf
     public function __construct(
         string $code,
         VersionSpecificationInterface $versionSpecification,
-        array $configuration = null
+        ?array $configuration = null
     ) {
         $this->codeSample = new CodeSample($code, $configuration);
         $this->versionSpecification = $versionSpecification;

diff --git a/src/Linter/TokenizerLintingResult.php b/src/Linter/TokenizerLintingResult.php
@@ -26,7 +26,7 @@ final class TokenizerLintingResult implements LintingResultInterface
      */
     private $error;
 
-    public function __construct(\Error $error = null)
+    public function __construct(?\Error $error = null)
     {
         $this->error = $error;
     }

diff --git a/src/Runner/FileFilterIterator.php b/src/Runner/FileFilterIterator.php
@@ -44,7 +44,7 @@ final class FileFilterIterator extends \FilterIterator
 
     public function __construct(
         \Traversable $iterator,
-        EventDispatcherInterface $eventDispatcher = null,
+        ?EventDispatcherInterface $eventDispatcher,
         CacheManagerInterface $cacheManager
     ) {
         if (!$iterator instanceof \Iterator) {

diff --git a/src/Runner/Runner.php b/src/Runner/Runner.php
@@ -91,12 +91,12 @@ public function __construct(
         $finder,
         array $fixers,
         DifferInterface $differ,
-        EventDispatcherInterface $eventDispatcher = null,
+        ?EventDispatcherInterface $eventDispatcher,
         ErrorsManager $errorsManager,
         LinterInterface $linter,
         $isDryRun,
         CacheManagerInterface $cacheManager,
-        DirectoryInterface $directory = null,
+        ?DirectoryInterface $directory = null,
         $stopOnViolation = false
     ) {
         $this->finder = $finder;

diff --git a/src/Tokenizer/Analyzer/Analysis/ArgumentAnalysis.php b/src/Tokenizer/Analyzer/Analysis/ArgumentAnalysis.php
@@ -43,11 +43,11 @@ final class ArgumentAnalysis
     /**
      * The type analysis of the argument.
      *
-     * @var null|TypeAnalysis
+     * @var ?TypeAnalysis
      */
     private $typeAnalysis;
 
-    public function __construct(string $name, int $nameIndex, ?string $default, TypeAnalysis $typeAnalysis = null)
+    public function __construct(string $name, int $nameIndex, ?string $default, ?TypeAnalysis $typeAnalysis = null)
     {
         $this->name = $name;
         $this->nameIndex = $nameIndex;

diff --git a/src/Tokenizer/Token.php b/src/Tokenizer/Token.php
@@ -438,7 +438,7 @@ public function toArray(): array
     /**
      * @param null|string[] $options JSON encode option
      */
-    public function toJson(array $options = null): string
+    public function toJson(?array $options = null): string
     {
         static $defaultOptions = null;
 

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -705,7 +705,7 @@ public function getPrevMeaningfulToken(int $index): ?int
      *
      * @return null|array<int, Token> an array containing the tokens matching the sequence elements, indexed by their position
      */
-    public function findSequence(array $sequence, int $start = 0, int $end = null, $caseSensitive = true): ?array
+    public function findSequence(array $sequence, int $start = 0, ?int $end = null, $caseSensitive = true): ?array
     {
         $sequenceCount = \count($sequence);
         if (0 === $sequenceCount) {

diff --git a/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php b/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
@@ -1249,7 +1249,7 @@ abstract public static function absPubStatFunc1();
      * @dataProvider provideFix74Cases
      * @requires PHP 7.4
      */
-    public function testFix74(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix74(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/ControlStructure/YodaStyleFixerTest.php b/tests/Fixer/ControlStructure/YodaStyleFixerTest.php
@@ -937,7 +937,7 @@ public function provideFixPhp74Cases()
      * @dataProvider providePHP74Cases
      * @requires PHP 7.4
      */
-    public function testPHP74CasesInverse(string $expected, ?string $input = null, array $configuration = null): void
+    public function testPHP74CasesInverse(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/Operator/BinaryOperatorSpacesFixerTest.php b/tests/Fixer/Operator/BinaryOperatorSpacesFixerTest.php
@@ -2008,7 +2008,7 @@ function A(){}[$a] = $a[$c];
      * @dataProvider provideFixPhp74Cases
      * @requires PHP 7.4
      */
-    public function testFixPhp74(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFixPhp74(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/Operator/OperatorLinebreakFixerTest.php b/tests/Fixer/Operator/OperatorLinebreakFixerTest.php
@@ -28,7 +28,7 @@ final class OperatorLinebreakFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);
@@ -196,7 +196,7 @@ function foo()
      *
      * @requires     PHP 7.1
      */
-    public function testFix71(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix71(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/Phpdoc/GeneralPhpdocTagRenameFixerTest.php b/tests/Fixer/Phpdoc/GeneralPhpdocTagRenameFixerTest.php
@@ -27,7 +27,7 @@ final class GeneralPhpdocTagRenameFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/Phpdoc/PhpdocInlineTagNormalizerFixerTest.php b/tests/Fixer/Phpdoc/PhpdocInlineTagNormalizerFixerTest.php
@@ -26,7 +26,7 @@ final class PhpdocInlineTagNormalizerFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);

diff --git a/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php
@@ -27,7 +27,7 @@ final class PhpdocTagTypeFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);