Update phpcs.xml (#8)

dereuromark · web-flow · commit ad420e3d587b · 2023-11-30T12:07:04.000+01:00
* Update phpcs.xml

* Fix up CS as per new rules.
diff --git a/PhpCollective/Sniffs/AbstractSniffs/AbstractSniff.php b/PhpCollective/Sniffs/AbstractSniffs/AbstractSniff.php
@@ -24,7 +24,7 @@ abstract class AbstractSniff implements Sniff
     /**
      * @var array<string> These markers must remain as inline comments
      */
-    protected static $phpStormMarkers = [
+    protected static array $phpStormMarkers = [
         '@noinspection',
     ];
 
@@ -156,7 +156,7 @@ protected function getClassName(File $phpCsFile): string
      *
      * @return bool
      */
-    protected function contains(File $phpcsFile, $search, int $start, int $end, bool $skipNested = true): bool
+    protected function contains(File $phpcsFile, array|string|int $search, int $start, int $end, bool $skipNested = true): bool
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/PhpCollective/Sniffs/Commenting/DisallowArrayTypeHintSyntaxSniff.php b/PhpCollective/Sniffs/Commenting/DisallowArrayTypeHintSyntaxSniff.php
@@ -46,12 +46,12 @@ class DisallowArrayTypeHintSyntaxSniff implements Sniff
     /**
      * @var array<string>
      */
-    public $traversableTypeHints = [];
+    public array $traversableTypeHints = [];
 
     /**
      * @var array<string, int>|null
      */
-    protected $normalizedTraversableTypeHints;
+    protected ?array $normalizedTraversableTypeHints = null;
 
     /**
      * @inheritDoc
@@ -204,14 +204,14 @@ public function getArrayTypeNodes(Node $node): array
                 /**
                  * @var list<\PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode>
                  */
-                private $nodes = [];
+                private array $nodes = [];
 
                 /**
                  * @param \PHPStan\PhpDocParser\Ast\Node $node
                  *
                  * @return \PHPStan\PhpDocParser\Ast\Node|list<\PHPStan\PhpDocParser\Ast\Node>|\PHPStan\PhpDocParser\Ast\NodeTraverser|int|null
                  */
-                public function enterNode(Node $node)
+                public function enterNode(Node $node): Node|array|\PHPStan\PhpDocParser\Ast\NodeTraverser|int|null
                 {
                     if ($node instanceof ArrayTypeNode) {
                         $this->nodes[] = $node;
diff --git a/PhpCollective/Sniffs/Commenting/DocBlockReturnVoidSniff.php b/PhpCollective/Sniffs/Commenting/DocBlockReturnVoidSniff.php
@@ -23,7 +23,7 @@ class DocBlockReturnVoidSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    protected $ignored = [
+    protected array $ignored = [
         '__construct',
         '__destruct',
     ];
diff --git a/PhpCollective/Sniffs/Commenting/DocBlockTagOrderSniff.php b/PhpCollective/Sniffs/Commenting/DocBlockTagOrderSniff.php
@@ -27,7 +27,7 @@ class DocBlockTagOrderSniff extends AbstractSniff
      *
      * @var array<int, string>
      */
-    protected $order = [
+    protected array $order = [
         '@deprecated',
         '@see',
         '@param',
diff --git a/PhpCollective/Sniffs/Commenting/DocBlockTypeOrderSniff.php b/PhpCollective/Sniffs/Commenting/DocBlockTypeOrderSniff.php
@@ -28,7 +28,7 @@ class DocBlockTypeOrderSniff extends AbstractSniff
      *
      * @var array<string>
      */
-    protected $sortMap = [
+    protected array $sortMap = [
         'void',
         'null',
         'false',
diff --git a/PhpCollective/Sniffs/Commenting/DocCommentSniff.php b/PhpCollective/Sniffs/Commenting/DocCommentSniff.php
@@ -24,7 +24,7 @@ class DocCommentSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    public $supportedTokenizers = [
+    public array $supportedTokenizers = [
         'PHP',
         'JS',
     ];
diff --git a/PhpCollective/Sniffs/Commenting/FileDocBlockSniff.php b/PhpCollective/Sniffs/Commenting/FileDocBlockSniff.php
@@ -21,7 +21,7 @@ class FileDocBlockSniff extends AbstractSniff
      *
      * @var array<string>
      */
-    protected $licenseMap = [];
+    protected array $licenseMap = [];
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/Commenting/FullyQualifiedClassNameInDocBlockSniff.php b/PhpCollective/Sniffs/Commenting/FullyQualifiedClassNameInDocBlockSniff.php
@@ -26,15 +26,15 @@ class FullyQualifiedClassNameInDocBlockSniff implements Sniff
     /**
      * @var array<string>
      */
-    public static $whitelistedTypes = [
+    public static array $whitelistedTypes = [
         'string', 'int', 'integer', 'float', 'bool', 'boolean', 'resource', 'null', 'void', 'callable',
         'array', 'iterable', 'mixed', 'object', 'false', 'true', 'self', 'static', '$this',
     ];
 
     /**
      * @var array<string>
      */
-    public static $whitelistedStartsWithTypes = ['array<', 'iterable<', 'array{'];
+    public static array $whitelistedStartsWithTypes = ['array<', 'iterable<', 'array{'];
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/Commenting/TypeHintSniff.php b/PhpCollective/Sniffs/Commenting/TypeHintSniff.php
@@ -43,7 +43,7 @@ class TypeHintSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    protected static $typeHintTags = [
+    protected static array $typeHintTags = [
         '@var',
         '@psalm-var',
         '@phpstan-var',
@@ -62,7 +62,7 @@ class TypeHintSniff extends AbstractSniff
      *
      * @var array<string>
      */
-    protected static $sortMap = [
+    protected static array $sortMap = [
         'mixed',
         'callable',
         'resource',
diff --git a/PhpCollective/Sniffs/ControlStructures/DisallowCloakingCheckSniff.php b/PhpCollective/Sniffs/ControlStructures/DisallowCloakingCheckSniff.php
@@ -22,7 +22,7 @@ class DisallowCloakingCheckSniff extends AbstractSniff
      *
      * @var bool
      */
-    public $strict = false;
+    public bool $strict = false;
 
     /**
      * @inheritDoc
@@ -35,7 +35,7 @@ public function register(): array
     /**
      * @var array<string>
      */
-    protected $validTokens = [
+    protected array $validTokens = [
         T_CLOSE_SQUARE_BRACKET,
         T_CLOSE_CURLY_BRACKET,
     ];
diff --git a/PhpCollective/Sniffs/Formatting/MethodSignatureParametersLineBreakMethodSniff.php b/PhpCollective/Sniffs/Formatting/MethodSignatureParametersLineBreakMethodSniff.php
@@ -18,17 +18,17 @@ class MethodSignatureParametersLineBreakMethodSniff extends AbstractSniff
     /**
      * @var int
      */
-    public $methodSignatureLengthHardBreak = 160;
+    public int $methodSignatureLengthHardBreak = 160;
 
     /**
      * @var int
      */
-    public $methodSignatureLengthSoftBreak = 80;
+    public int $methodSignatureLengthSoftBreak = 80;
 
     /**
      * @var int
      */
-    public $methodSignatureNumberParameterSoftBreak = 3;
+    public int $methodSignatureNumberParameterSoftBreak = 3;
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/Internal/DisallowFunctionsSniff.php b/PhpCollective/Sniffs/Internal/DisallowFunctionsSniff.php
@@ -37,28 +37,28 @@ class DisallowFunctionsSniff extends AbstractSniff
      *
      * @var string|null
      */
-    public $phpVersion;
+    public ?string $phpVersion = null;
 
     /**
      * @var array<string, array<string>>
      */
-    protected static $methods = [
+    protected static array $methods = [
     ];
 
     /**
      * @var bool|null
      */
-    protected static $enabled;
+    protected static ?bool $enabled = null;
 
     /**
      * @var array<string>
      */
-    protected static $disallowed = [];
+    protected static array $disallowed = [];
 
     /**
      * @var array<int>
      */
-    protected static $wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
+    protected static array $wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/Namespaces/UseStatementSniff.php b/PhpCollective/Sniffs/Namespaces/UseStatementSniff.php
@@ -23,22 +23,22 @@ class UseStatementSniff implements Sniff
     /**
      * @var array<string, array<string, mixed>>|null
      */
-    protected $existingStatements;
+    protected ?array $existingStatements = null;
 
     /**
      * @var array<string, array<string, mixed>>
      */
-    protected $newStatements = [];
+    protected array $newStatements = [];
 
     /**
      * @var array<string, array<string, mixed>>|null
      */
-    protected $allStatements;
+    protected ?array $allStatements = null;
 
     /**
      * @var string|null
      */
-    protected $className;
+    protected ?string $className = null;
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/PHP/DeclareStrictTypesSniff.php b/PhpCollective/Sniffs/PHP/DeclareStrictTypesSniff.php
@@ -26,24 +26,24 @@ class DeclareStrictTypesSniff implements Sniff
      *
      * @var bool
      */
-    public $declareOnFirstLine = false;
+    public bool $declareOnFirstLine = false;
 
     /**
      * Only in effect if $declareOnFirstLine is false, e.g. a file docblock is between.
      *
      * @var int
      */
-    public $linesCountBeforeDeclare = 1;
+    public int $linesCountBeforeDeclare = 1;
 
     /**
      * @var int
      */
-    public $linesCountAfterDeclare = 1;
+    public int $linesCountAfterDeclare = 1;
 
     /**
      * @var int
      */
-    public $spacesCountAroundEqualsSign = 0;
+    public int $spacesCountAroundEqualsSign = 0;
 
     /**
      * @return array<int, (int|string)>
@@ -248,7 +248,7 @@ protected function getStrictTypeDeclaration(): string
      *
      * @return int
      */
-    protected function normalizeIntValue($value): int
+    protected function normalizeIntValue(mixed $value): int
     {
         return (int)trim((string)$value);
     }
diff --git a/PhpCollective/Sniffs/PHP/DisallowFunctionsSniff.php b/PhpCollective/Sniffs/PHP/DisallowFunctionsSniff.php
@@ -18,12 +18,12 @@ class DisallowFunctionsSniff implements Sniff
     /**
      * @var array<string>
      */
-    public static $disallowed = [];
+    public static array $disallowed = [];
 
     /**
      * @var array<int>
      */
-    protected static $wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
+    protected static array $wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
 
     /**
      * @inheritDoc
diff --git a/PhpCollective/Sniffs/PHP/DisallowTrailingCommaInSingleLineSniff.php b/PhpCollective/Sniffs/PHP/DisallowTrailingCommaInSingleLineSniff.php
@@ -18,7 +18,7 @@ class DisallowTrailingCommaInSingleLineSniff implements Sniff
     /**
      * @var array<string|int>
      */
-    protected $closingTokens = [
+    protected array $closingTokens = [
         T_CLOSE_PARENTHESIS,
         T_CLOSE_SQUARE_BRACKET,
     ];
diff --git a/PhpCollective/Sniffs/PHP/ExitSniff.php b/PhpCollective/Sniffs/PHP/ExitSniff.php
@@ -20,7 +20,7 @@ class ExitSniff implements Sniff
      *
      * @var array<string>
      */
-    public static $aliases = [
+    public static array $aliases = [
         'die' => 'exit',
     ];
 
diff --git a/PhpCollective/Sniffs/PHP/NotEqualSniff.php b/PhpCollective/Sniffs/PHP/NotEqualSniff.php
@@ -18,7 +18,7 @@ class NotEqualSniff implements Sniff
     /**
      * @var array<string>
      */
-    public static $matching = [
+    public static array $matching = [
         '<>' => '!=',
     ];
 
diff --git a/PhpCollective/Sniffs/PHP/PreferCastOverFunctionSniff.php b/PhpCollective/Sniffs/PHP/PreferCastOverFunctionSniff.php
@@ -18,7 +18,7 @@ class PreferCastOverFunctionSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    protected static $matching = [
+    protected static array $matching = [
         'strval' => 'string',
         'intval' => 'int',
         'floatval' => 'float',
diff --git a/PhpCollective/Sniffs/PHP/RemoveFunctionAliasSniff.php b/PhpCollective/Sniffs/PHP/RemoveFunctionAliasSniff.php
@@ -20,7 +20,7 @@ class RemoveFunctionAliasSniff implements Sniff
      *
      * @var array<string>
      */
-    public static $matching = [
+    public static array $matching = [
         'is_integer' => 'is_int',
         'is_long' => 'is_int',
         'is_real' => 'is_float',
diff --git a/PhpCollective/Sniffs/PHP/ShortCastSniff.php b/PhpCollective/Sniffs/PHP/ShortCastSniff.php
@@ -18,7 +18,7 @@ class ShortCastSniff implements Sniff
     /**
      * @var array<string>
      */
-    public static $matching = [
+    public static array $matching = [
         '(boolean)' => '(bool)',
         '(integer)' => '(int)',
     ];
diff --git a/PhpCollective/Sniffs/Testing/AssertPrimitivesSniff.php b/PhpCollective/Sniffs/Testing/AssertPrimitivesSniff.php
@@ -26,7 +26,7 @@ class AssertPrimitivesSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    protected static $primitives = [
+    protected static array $primitives = [
         'null',
         'true',
         'false',
diff --git a/PhpCollective/Sniffs/WhiteSpace/EmptyLinesSniff.php b/PhpCollective/Sniffs/WhiteSpace/EmptyLinesSniff.php
@@ -21,7 +21,7 @@ class EmptyLinesSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    public $supportedTokenizers = [
+    public array $supportedTokenizers = [
         'PHP',
         'JS',
         'CSS',
diff --git a/PhpCollective/Sniffs/WhiteSpace/TernarySpacingSniff.php b/PhpCollective/Sniffs/WhiteSpace/TernarySpacingSniff.php
@@ -21,7 +21,7 @@ class TernarySpacingSniff extends AbstractSniff
     /**
      * @var array<string>
      */
-    public $supportedTokenizers = [
+    public array $supportedTokenizers = [
         'PHP',
     ];
 
diff --git a/PhpCollective/Tools/SniffsAndTests.php b/PhpCollective/Tools/SniffsAndTests.php
@@ -17,7 +17,7 @@ class SniffsAndTests
     /**
      * @var array<string>
      */
-    protected static $orgs = [
+    protected static array $orgs = [
         'PhpCollective',
         'PhpCollectiveStrict',
     ];
diff --git a/PhpCollective/Tools/Tokenizer.php b/PhpCollective/Tools/Tokenizer.php
@@ -24,17 +24,17 @@ class Tokenizer
     /**
      * @var string
      */
-    protected $root;
+    protected string $root;
 
     /**
      * @var string
      */
-    protected $path;
+    protected string $path;
 
     /**
      * @var bool
      */
-    protected $verbose;
+    protected bool $verbose;
 
     /**
      * @param array<string> $argv
diff --git a/PhpCollective/Traits/BasicsTrait.php b/PhpCollective/Traits/BasicsTrait.php
diff --git a/phpcs.xml b/phpcs.xml

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class DocBlockTagOrderSniff extends AbstractSniff`
`27`	`27`	`*`
`28`	`28`	`* @var array<int, string>`
`29`	`29`	`*/`
`30`		`- protected $order = [`
	`30`	`+ protected array $order = [`
`31`	`31`	`'@deprecated',`
`32`	`32`	`'@see',`
`33`	`33`	`'@param',`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class DocBlockTypeOrderSniff extends AbstractSniff`
`28`	`28`	`*`
`29`	`29`	`* @var array<string>`
`30`	`30`	`*/`
`31`		`- protected $sortMap = [`
	`31`	`+ protected array $sortMap = [`
`32`	`32`	`'void',`
`33`	`33`	`'null',`
`34`	`34`	`'false',`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class FileDocBlockSniff extends AbstractSniff`
`21`	`21`	`*`
`22`	`22`	`* @var array<string>`
`23`	`23`	`*/`
`24`		`- protected $licenseMap = [];`
	`24`	`+ protected array $licenseMap = [];`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* @inheritDoc`