[PHP 8.3] Make use of typed constants

build/build-preload.php

@@ -43,10 +43,7 @@
 
 final class PreloadBuilder
 {
-    /**
-     * @var string
-     */
-    private const PRELOAD_FILE_TEMPLATE = <<<'CODE_SAMPLE'
+    private const string PRELOAD_FILE_TEMPLATE = <<<'CODE_SAMPLE'
 <?php
 
 declare(strict_types=1);
@@ -75,18 +72,15 @@ function isPHPStanTestPreloaded(): bool
 }
 CODE_SAMPLE;
 
-    /**
-     * @var int
-     */
-    private const PRIORITY_LESS_FILE_POSITION = -1;
+    private const int PRIORITY_LESS_FILE_POSITION = -1;
 
     /**
      * These files are parent to another files, so they have to be included first
      * See https://github.com/rectorphp/rector/issues/6709 for more
      *
      * @var string[]
      */
-    private const HIGH_PRIORITY_FILES = [
+    private const array HIGH_PRIORITY_FILES = [
         // nikic/php-parser
         'Node.php',
         'NodeAbstract.php',
@@ -131,7 +125,7 @@ function isPHPStanTestPreloaded(): bool
      *
      * @var string[]
      */
-    private const IN_USE_CLASS_FILES = [
+    private const array IN_USE_CLASS_FILES = [
         'Node/Expr/ArrayItem.php',
         'Node/Expr/ClosureUse.php',
         'Node/Scalar/EncapsedStringPart.php',

rector.php

@@ -6,6 +6,7 @@
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php83\Rector\ClassConst\AddTypeToConstRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\AddSeeTestAnnotationRector;
 use Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector;
 
@@ -39,7 +40,10 @@
     ])
     ->withRootFiles()
     ->withImportNames(removeUnusedImports: true)
-    ->withRules([RemoveRefactorDuplicatedNodeInstanceCheckRector::class, AddSeeTestAnnotationRector::class])
+    ->withRules([
+        RemoveRefactorDuplicatedNodeInstanceCheckRector::class, AddSeeTestAnnotationRector::class,
+        AddTypeToConstRector::class,
+    ])
     ->withSkip([
         StringClassNameToClassConstantRector::class,
         // tests

rules-tests/Php83/Rector/ClassConst/AddTypeToConstRector/Fixture/remove_docblock_as_useless.php.inc

@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\Tests\Php83\Rector\ClassConst\AddTypeToConstRector\Fixture;
+
+final class RemoveDocBlockAsUseless
+{
+    /**
+     * @var int
+     */
+    private const A = 1000;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php83\Rector\ClassConst\AddTypeToConstRector\Fixture;
+
+final class RemoveDocBlockAsUseless
+{
+    private const int A = 1000;
+}
+
+?>

rules/Arguments/NodeAnalyzer/ArgumentAddingScope.php

@@ -16,21 +16,18 @@
 {
     /**
      * @api
-     * @var string
      */
-    public const SCOPE_PARENT_CALL = 'parent_call';
+    public const string SCOPE_PARENT_CALL = 'parent_call';
 
     /**
      * @api
-     * @var string
      */
-    public const SCOPE_METHOD_CALL = 'method_call';
+    public const string SCOPE_METHOD_CALL = 'method_call';
 
     /**
      * @api
-     * @var string
      */
-    public const SCOPE_CLASS_METHOD = 'class_method';
+    public const string SCOPE_CLASS_METHOD = 'class_method';
 
     public function __construct(
         private NodeNameResolver $nodeNameResolver

rules/Arguments/ValueObject/ReplaceArgumentDefaultValue.php

@@ -10,10 +10,7 @@
 
 final readonly class ReplaceArgumentDefaultValue implements ReplaceArgumentDefaultValueInterface
 {
-    /**
-     * @var string
-     */
-    public const ANY_VALUE_BEFORE = '*ANY_VALUE_BEFORE*';
+    public const string ANY_VALUE_BEFORE = '*ANY_VALUE_BEFORE*';
 
     /**
      * @param int<0, max> $position

rules/Assert/Enum/AssertClassName.php

@@ -6,13 +6,7 @@
 
 final class AssertClassName
 {
-    /**
-     * @var string
-     */
-    public const WEBMOZART = 'Webmozart\Assert\Assert';
+    public const string WEBMOZART = 'Webmozart\Assert\Assert';
 
-    /**
-     * @var string
-     */
-    public const BEBERLEI = 'Assert\Assertion';
+    public const string BEBERLEI = 'Assert\Assertion';
 }

rules/Carbon/NodeFactory/CarbonCallFactory.php

@@ -16,16 +16,14 @@
 final class CarbonCallFactory
 {
     /**
-     * @var string
      * @see https://regex101.com/r/LLMrFw/1
      */
-    private const PLUS_MINUS_COUNT_REGEX = '#(?<operator>\+|-)(\\s+)?(?<count>\\d+)(\s+)?(?<unit>seconds|second|sec|minutes|minute|min|hours|hour|days|day|weeks|week|months|month|years|year)#';
+    private const string PLUS_MINUS_COUNT_REGEX = '#(?<operator>\+|-)(\\s+)?(?<count>\\d+)(\s+)?(?<unit>seconds|second|sec|minutes|minute|min|hours|hour|days|day|weeks|week|months|month|years|year)#';
 
     /**
-     * @var string
      * @see https://regex101.com/r/IhxHTO/1
      */
-    private const STATIC_DATE_REGEX = '#now|yesterday|today|tomorrow#';
+    private const string STATIC_DATE_REGEX = '#now|yesterday|today|tomorrow#';
 
     public function createFromDateTimeString(
         FullyQualified $carbonFullyQualified,

rules/Carbon/Rector/FuncCall/DateFuncCallToCarbonRector.php

@@ -24,7 +24,7 @@
  */
 final class DateFuncCallToCarbonRector extends AbstractRector
 {
-    private const TIME_UNITS = [
+    private const array TIME_UNITS = [
         ['weeks', 604800],
         ['days', 86400],
         ['hours', 3600],

rules/CodeQuality/NodeAnalyzer/LocalPropertyAnalyzer.php

@@ -28,10 +28,7 @@
 
 final readonly class LocalPropertyAnalyzer
 {
-    /**
-     * @var string
-     */
-    private const LARAVEL_COLLECTION_CLASS = 'Illuminate\Support\Collection';
+    private const string LARAVEL_COLLECTION_CLASS = 'Illuminate\Support\Collection';
 
     public function __construct(
         private SimpleCallableNodeTraverser $simpleCallableNodeTraverser,

rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php

@@ -29,10 +29,7 @@
  */
 final class ThrowWithPreviousExceptionRector extends AbstractRector
 {
-    /**
-     * @var int
-     */
-    private const DEFAULT_EXCEPTION_ARGUMENT_POSITION = 2;
+    private const int DEFAULT_EXCEPTION_ARGUMENT_POSITION = 2;
 
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider

rules/CodeQuality/Rector/Concat/JoinStringConcatRector.php

@@ -18,17 +18,13 @@
  */
 final class JoinStringConcatRector extends AbstractRector
 {
-    /**
-     * @var int
-     */
-    private const LINE_BREAK_POINT = 100;
+    private const int LINE_BREAK_POINT = 100;
 
     /**
-     * @var string
      * @see https://regex101.com/r/VaXM1t/1
      * @see https://stackoverflow.com/questions/4147646/determine-if-utf-8-text-is-all-ascii
      */
-    private const ASCII_REGEX = '#[^\x00-\x7F]#';
+    private const string ASCII_REGEX = '#[^\x00-\x7F]#';
 
     public function getRuleDefinition(): RuleDefinition
     {

rules/CodeQuality/Rector/For_/ForRepeatedCountToOwnVariableRector.php

@@ -24,10 +24,7 @@
  */
 final class ForRepeatedCountToOwnVariableRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const COUNTER_NAME = 'counter';
+    private const string COUNTER_NAME = 'counter';
 
     public function getRuleDefinition(): RuleDefinition
     {

rules/CodeQuality/Rector/FuncCall/SetTypeToCastRector.php

@@ -28,7 +28,7 @@ final class SetTypeToCastRector extends AbstractRector
     /**
      * @var array<string, class-string<Cast>>
      */
-    private const TYPE_TO_CAST = [
+    private const array TYPE_TO_CAST = [
         'array' => Array_::class,
         'bool' => Bool_::class,
         'boolean' => Bool_::class,

rules/CodeQuality/Rector/FuncCall/SimplifyRegexPatternRector.php

@@ -23,7 +23,7 @@ final class SimplifyRegexPatternRector extends AbstractRector
      *
      * @var array<string, string>
      */
-    private const COMPLEX_PATTERN_TO_SIMPLE = [
+    private const array COMPLEX_PATTERN_TO_SIMPLE = [
         '[0-9]' => "\d",
         '[a-zA-Z0-9_]' => "\w",
         '[A-Za-z0-9_]' => "\w",

rules/CodeQuality/Rector/FuncCall/SimplifyStrposLowerRector.php

@@ -19,10 +19,9 @@
 final class SimplifyStrposLowerRector extends AbstractRector
 {
     /**
-     * @var string
      * @see https://regex101.com/r/Jokjt8/1
      */
-    private const UPPERCASE_REGEX = '#[A-Z]#';
+    private const string UPPERCASE_REGEX = '#[A-Z]#';
 
     public function getRuleDefinition(): RuleDefinition
     {

rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php

@@ -32,9 +32,8 @@ final class SimplifyUselessVariableRector extends AbstractRector implements Conf
 {
     /**
      * @api
-     * @var string
      */
-    public const ONLY_DIRECT_ASSIGN = 'only_direct_assign';
+    public const string ONLY_DIRECT_ASSIGN = 'only_direct_assign';
 
     private bool $onlyDirectAssign = false;
 

rules/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector.php

@@ -25,10 +25,7 @@
  */
 final class SimplifyIfElseToTernaryRector extends AbstractRector
 {
-    /**
-     * @var int
-     */
-    private const LINE_LENGTH_LIMIT = 120;
+    private const int LINE_LENGTH_LIMIT = 120;
 
     public function __construct(
         private readonly BetterStandardPrinter $betterStandardPrinter,

rules/CodeQuality/Rector/Include_/AbsolutizeRequireAndIncludePathRector.php

@@ -22,10 +22,9 @@
 final class AbsolutizeRequireAndIncludePathRector extends AbstractRector
 {
     /**
-     * @var string
      * @see https://regex101.com/r/N8oLqv/1
      */
-    private const WINDOWS_DRIVE_REGEX = '#^[a-zA-z]\:[\/\\\]#';
+    private const string WINDOWS_DRIVE_REGEX = '#^[a-zA-z]\:[\/\\\]#';
 
     public function __construct(
         private readonly ValueResolver $valueResolver

rules/CodingStyle/ClassNameImport/ClassNameImportSkipVoter/ReservedClassNameImportSkipVoter.php

@@ -14,7 +14,7 @@
     /**
      * @var string[]
      */
-    private const RESERVED_CLASS_NAMES = [
+    private const array RESERVED_CLASS_NAMES = [
         'bool',
         'false',
         'float',

rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php

@@ -19,12 +19,10 @@
 final readonly class UseImportNameMatcher
 {
     /**
-     * @var string
-     *
      * @see https://regex101.com/r/ZxFSlc/1 for last name, eg: Entity and UniqueEntity
      * @see https://regex101.com/r/OLO0Un/1 for inside namespace, eg: ORM for ORM\Id or ORM\Column
      */
-    private const SHORT_NAME_REGEX = '#^%s(\\\\[\w]+)?$#i';
+    private const string SHORT_NAME_REGEX = '#^%s(\\\\[\w]+)?$#i';
 
     public function __construct(
         private BetterNodeFinder $betterNodeFinder,

rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php

@@ -32,10 +32,9 @@
 final class CatchExceptionNameMatchingTypeRector extends AbstractRector
 {
     /**
-     * @var string
      * @see https://regex101.com/r/xmfMAX/1
      */
-    private const STARTS_WITH_ABBREVIATION_REGEX = '#^([A-Za-z]+?)([A-Z]{1}[a-z]{1})([A-Za-z]*)#';
+    private const string STARTS_WITH_ABBREVIATION_REGEX = '#^([A-Za-z]+?)([A-Z]{1}[a-z]{1})([A-Za-z]*)#';
 
     public function __construct(
         private readonly PropertyNaming $propertyNaming,

rules/CodingStyle/Rector/Encapsed/EncapsedStringsToSprintfRector.php

@@ -30,14 +30,13 @@ final class EncapsedStringsToSprintfRector extends AbstractRector implements Con
 {
     /**
      * @api
-     * @var string
      */
-    public const ALWAYS = 'always';
+    public const string ALWAYS = 'always';
 
     /**
      * @var array<string, array<class-string<Type>>>
      */
-    private const FORMAT_SPECIFIERS = [
+    private const array FORMAT_SPECIFIERS = [
         '%s' => ['PHPStan\Type\StringType'],
         '%d' => [
             'PHPStan\Type\Constant\ConstantIntegerType',

rules/CodingStyle/Rector/FuncCall/VersionCompareFuncCallToConstantRector.php

@@ -31,7 +31,7 @@ final class VersionCompareFuncCallToConstantRector extends AbstractRector
     /**
      * @var array<string, class-string<BinaryOp>>
      */
-    private const OPERATOR_TO_COMPARISON = [
+    private const array OPERATOR_TO_COMPARISON = [
         '=' => Identical::class,
         '==' => Identical::class,
         'eq' => Identical::class,

rules/CodingStyle/Rector/String_/SimplifyQuoteEscapeRector.php

@@ -18,17 +18,15 @@
 final class SimplifyQuoteEscapeRector extends AbstractRector
 {
     /**
-     * @var string
      * @see https://regex101.com/r/qEkCe9/2
      */
-    private const ESCAPED_CHAR_REGEX = '#\\\\|\$|\\n|\\t#sim';
+    private const string ESCAPED_CHAR_REGEX = '#\\\\|\$|\\n|\\t#sim';
 
     /**
-     * @var string
      * @see https://alvinalexander.com/php/how-to-remove-non-printable-characters-in-string-regex/
      * @see https://regex101.com/r/lGUhRb/1
      */
-    private const HAS_NON_PRINTABLE_CHARS = '#[\x00-\x1F\x80-\xFF]#';
+    private const string HAS_NON_PRINTABLE_CHARS = '#[\x00-\x1F\x80-\xFF]#';
 
     private bool $hasChanged = false;
 

rules/CodingStyle/Rector/String_/UseClassKeywordForClassNameResolutionRector.php

@@ -21,10 +21,9 @@
 final class UseClassKeywordForClassNameResolutionRector extends AbstractRector
 {
     /**
-     * @var string
      * @see https://regex101.com/r/Vv41Qr/1/
      */
-    private const CLASS_BEFORE_STATIC_ACCESS_REGEX = '#(?<class_name>[\\\\a-zA-Z0-9_\\x80-\\xff]*)::#';
+    private const string CLASS_BEFORE_STATIC_ACCESS_REGEX = '#(?<class_name>[\\\\a-zA-Z0-9_\\x80-\\xff]*)::#';
 
     public function __construct(
         private readonly ReflectionProvider $reflectionProvider

rules/CodingStyle/ValueObject/ObjectMagicMethods.php

@@ -11,7 +11,7 @@ final class ObjectMagicMethods
     /**
      * @var string[]
      */
-    public const METHOD_NAMES = [
+    public const array METHOD_NAMES = [
         '__call',
         '__callStatic',
         MethodName::CLONE,

rules/DeadCode/PhpDoc/Guard/StandaloneTypeRemovalGuard.php

@@ -14,7 +14,7 @@ final class StandaloneTypeRemovalGuard
     /**
      * @var string[]
      */
-    private const ALLOWED_TYPES = ['false', 'true'];
+    private const array ALLOWED_TYPES = ['false', 'true'];
 
     public function isLegal(TypeNode $typeNode, Node $node): bool
     {