bump to PHP 8.3

TomasVotruba · TomasVotruba · commit 4694e383b533 · 2026-01-16T20:41:13.000+01:00
diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml
diff --git a/rector.php b/rector.php
@@ -10,13 +10,14 @@
 
 return RectorConfig::configure()
     ->withImportNames(removeUnusedImports: true)
-    ->withPhpSets(php82: true)
+    ->withPhpSets()
     ->withComposerBased(phpunit: true)
     ->withPreparedSets(
         deadCode: true,
         codeQuality: true,
         codingStyle: true,
         typeDeclarations: true,
+        typeDeclarationDocblocks: true,
         privatization: true,
         naming: true,
         earlyReturn: true,
diff --git a/rules/DowngradePhp72/NodeAnalyzer/RegexFuncAnalyzer.php b/rules/DowngradePhp72/NodeAnalyzer/RegexFuncAnalyzer.php
@@ -15,7 +15,7 @@
     /**
      * @var string[]
      */
-    private const REGEX_FUNCTION_NAMES = ['preg_match', 'preg_match_all'];
+    private const array REGEX_FUNCTION_NAMES = ['preg_match', 'preg_match_all'];
 
     public function __construct(
         private NodeNameResolver $nodeNameResolver,
diff --git a/rules/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector.php b/rules/DowngradePhp72/Rector/ConstFetch/DowngradePhp72JsonConstRector.php
@@ -24,10 +24,7 @@
  */
 final class DowngradePhp72JsonConstRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const PHP72_JSON_CONSTANT_IS_KNOWN = 'php72_json_constant_is_known';
+    private const string PHP72_JSON_CONSTANT_IS_KNOWN = 'php72_json_constant_is_known';
 
     public function __construct(
         private readonly JsonConstCleaner $jsonConstCleaner,
diff --git a/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php b/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php
@@ -34,9 +34,8 @@ final class DowngradePregUnmatchedAsNullConstantRector extends AbstractRector
 {
     /**
      * @see https://www.php.net/manual/en/function.preg-match.php
-     * @var string
      */
-    private const UNMATCHED_NULL_FLAG = 'PREG_UNMATCHED_AS_NULL';
+    private const string UNMATCHED_NULL_FLAG = 'PREG_UNMATCHED_AS_NULL';
 
     public function __construct(
         private readonly BitwiseFlagCleaner $bitwiseFlagCleaner,
diff --git a/rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php b/rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php
@@ -34,15 +34,12 @@
  */
 final class DowngradePhp73JsonConstRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const PHP73_JSON_CONSTANT_IS_KNOWN = 'php73_json_constant_is_known';
+    private const string PHP73_JSON_CONSTANT_IS_KNOWN = 'php73_json_constant_is_known';
 
     /**
      * @var array<string>
      */
-    private const JSON_FUNCTIONS = ['json_decode', 'json_encode'];
+    private const array JSON_FUNCTIONS = ['json_decode', 'json_encode'];
 
     public function __construct(
         private readonly JsonConstCleaner $jsonConstCleaner,
diff --git a/rules/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector.php b/rules/DowngradePhp73/Rector/FuncCall/SetCookieOptionsArrayToArgumentsRector.php
@@ -25,7 +25,7 @@ final class SetCookieOptionsArrayToArgumentsRector extends AbstractRector
      * Conversion table from argument index to options name
      * @var array<string, int>
      */
-    private const ARGUMENT_ORDER = [
+    private const array ARGUMENT_ORDER = [
         'expires' => 2,
         'path' => 3,
         'domain' => 4,
@@ -37,7 +37,7 @@ final class SetCookieOptionsArrayToArgumentsRector extends AbstractRector
      * Conversion table from argument index to options name
      * @var array<int, int|string|bool>
      */
-    private const ARGUMENT_DEFAULT_VALUES = [
+    private const array ARGUMENT_DEFAULT_VALUES = [
         2 => 0,
         3 => '',
         4 => '',
diff --git a/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php b/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php
@@ -26,15 +26,9 @@
  */
 final class DowngradeListReferenceAssignmentRector extends AbstractRector
 {
-    /**
-     * @var int
-     */
-    private const ALL = 0;
+    private const int ALL = 0;
 
-    /**
-     * @var int
-     */
-    private const ANY = 1;
+    private const int ANY = 1;
 
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/rules/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector.php b/rules/DowngradePhp73/Rector/String_/DowngradeFlexibleHeredocSyntaxRector.php
@@ -21,7 +21,7 @@ final class DowngradeFlexibleHeredocSyntaxRector extends AbstractRector
     /**
      * @var int[]
      */
-    private const HERENOW_DOC_KINDS = [String_::KIND_HEREDOC, String_::KIND_NOWDOC];
+    private const array HERENOW_DOC_KINDS = [String_::KIND_HEREDOC, String_::KIND_NOWDOC];
 
     public function __construct(
         private readonly FollowedByNewlineOnlyMaybeWithSemicolonAnalyzer $followedByNewlineOnlyMaybeWithSemicolonAnalyzer
diff --git a/rules/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector.php b/rules/DowngradePhp74/Rector/Identical/DowngradeFreadFwriteFalsyToNegationRector.php
@@ -22,7 +22,7 @@ final class DowngradeFreadFwriteFalsyToNegationRector extends AbstractRector
     /**
      * @var string[]
      */
-    private const FUNC_FREAD_FWRITE = ['fread', 'fwrite'];
+    private const array FUNC_FREAD_FWRITE = ['fread', 'fwrite'];
 
     public function __construct(
         private readonly ValueResolver $valueResolver
diff --git a/rules/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector.php b/rules/DowngradePhp74/Rector/MethodCall/DowngradeReflectionGetTypeRector.php
@@ -22,10 +22,7 @@
  */
 final class DowngradeReflectionGetTypeRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const SKIP_NODE = 'skip_node';
+    private const string SKIP_NODE = 'skip_node';
 
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
@@ -37,7 +37,12 @@ final class DowngradeAttributeToAnnotationRector extends AbstractRector implemen
     /**
      * @var string[]
      */
-    private const SKIPPED_ATTRIBUTES = ['Attribute', 'ReturnTypeWillChange', 'AllowDynamicProperties', 'Override'];
+    private const array SKIPPED_ATTRIBUTES = [
+        'Attribute',
+        'ReturnTypeWillChange',
+        'AllowDynamicProperties',
+        'Override',
+    ];
 
     /**
      * @var DowngradeAttributeToAnnotation[]
diff --git a/rules/DowngradePhp80/Rector/FuncCall/DowngradeSubstrFalsyRector.php b/rules/DowngradePhp80/Rector/FuncCall/DowngradeSubstrFalsyRector.php
@@ -44,10 +44,7 @@
  */
 final class DowngradeSubstrFalsyRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const IS_FALSY_UNCASTABLE = 'is_falsy_uncastable';
+    private const string IS_FALSY_UNCASTABLE = 'is_falsy_uncastable';
 
     public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
diff --git a/rules/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector.php b/rules/DowngradePhp80/Rector/Instanceof_/DowngradePhp80ResourceReturnToObjectRector.php
@@ -22,7 +22,7 @@ final class DowngradePhp80ResourceReturnToObjectRector extends AbstractRector
     /**
      * @var string[]
      */
-    private const COLLECTION_OBJECT_TO_RESOURCE = [
+    private const array COLLECTION_OBJECT_TO_RESOURCE = [
         // curl
         'CurlHandle',
         'CurlMultiHandle',
diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector.php
@@ -36,7 +36,7 @@ final class DowngradeReflectionClassGetConstantsFilterRector extends AbstractRec
     /**
      * @var array<string, string>
      */
-    private const MAP_CONSTANT_TO_METHOD = [
+    private const array MAP_CONSTANT_TO_METHOD = [
         'IS_PUBLIC' => 'isPublic',
         'IS_PROTECTED' => 'isProtected',
         'IS_PRIVATE' => 'isPrivate',
diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector.php
@@ -22,10 +22,7 @@
  */
 final class DowngradeReflectionGetAttributesRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const IS_IF_TERNARY = 'is_if_ternary';
+    private const string IS_IF_TERNARY = 'is_if_ternary';
 
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/rules/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector.php b/rules/DowngradePhp80/Rector/StaticCall/DowngradePhpTokenRector.php
@@ -26,10 +26,7 @@
  */
 final class DowngradePhpTokenRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const PHP_TOKEN = 'PhpToken';
+    private const string PHP_TOKEN = 'PhpToken';
 
     public function getRuleDefinition(): RuleDefinition
     {
diff --git a/rules/DowngradePhp81/NodeManipulator/ObjectToResourceReturn.php b/rules/DowngradePhp81/NodeManipulator/ObjectToResourceReturn.php
@@ -20,10 +20,7 @@
 
 final readonly class ObjectToResourceReturn
 {
-    /**
-     * @var string
-     */
-    private const IS_INSTANCEOF_IN_BINARYOP = 'is_instanceof_in_binaryop';
+    private const string IS_INSTANCEOF_IN_BINARYOP = 'is_instanceof_in_binaryop';
 
     public function __construct(
         private NodeNameResolver $nodeNameResolver,
diff --git a/rules/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHashRector.php b/rules/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHashRector.php
@@ -26,14 +26,14 @@ final class DowngradeHashAlgorithmXxHashRector extends AbstractRector
     /**
      * @var array<string, int>
      */
-    private const HASH_ALGORITHMS_TO_DOWNGRADE = [
+    private const array HASH_ALGORITHMS_TO_DOWNGRADE = [
         'xxh32' => MHASH_XXH32,
         'xxh64' => MHASH_XXH64,
         'xxh3' => MHASH_XXH3,
         'xxh128' => MHASH_XXH128,
     ];
 
-    private const REPLACEMENT_ALGORITHM = 'md5';
+    private const string REPLACEMENT_ALGORITHM = 'md5';
 
     private int $argNamedKey;
 
diff --git a/rules/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector.php b/rules/DowngradePhp81/Rector/Instanceof_/DowngradePhp81ResourceReturnToObjectRector.php
@@ -23,7 +23,7 @@ final class DowngradePhp81ResourceReturnToObjectRector extends AbstractRector
     /**
      * @var string[]|class-string<finfo>[]
      */
-    private const COLLECTION_OBJECT_TO_RESOURCE = [
+    private const array COLLECTION_OBJECT_TO_RESOURCE = [
         // finfo
         'finfo',
 
diff --git a/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php b/rules/DowngradePhp81/Rector/Property/DowngradeReadonlyPropertyRector.php
@@ -25,10 +25,7 @@
  */
 final class DowngradeReadonlyPropertyRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const TAGNAME = 'readonly';
+    private const string TAGNAME = 'readonly';
 
     public function __construct(
         private readonly VisibilityManipulator $visibilityManipulator,
diff --git a/rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php b/rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php
@@ -26,10 +26,7 @@
  */
 final class DowngradeFinalPropertyPromotionRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const TAGNAME = 'final';
+    private const string TAGNAME = 'final';
 
     public function __construct(
         private readonly VisibilityManipulator $visibilityManipulator,
diff --git a/src/Enum/JsonConstant.php b/src/Enum/JsonConstant.php
@@ -6,18 +6,9 @@
 
 final class JsonConstant
 {
-    /**
-     * @var string
-     */
-    public const INVALID_UTF8_IGNORE = 'JSON_INVALID_UTF8_IGNORE';
+    public const string INVALID_UTF8_IGNORE = 'JSON_INVALID_UTF8_IGNORE';
 
-    /**
-     * @var string
-     */
-    public const INVALID_UTF8_SUBSTITUTE = 'JSON_INVALID_UTF8_SUBSTITUTE';
+    public const string INVALID_UTF8_SUBSTITUTE = 'JSON_INVALID_UTF8_SUBSTITUTE';
 
-    /**
-     * @var string
-     */
-    public const THROW_ON_ERROR = 'JSON_THROW_ON_ERROR';
+    public const string THROW_ON_ERROR = 'JSON_THROW_ON_ERROR';
 }
diff --git a/src/NodeAnalyzer/CoalesceAnalyzer.php b/src/NodeAnalyzer/CoalesceAnalyzer.php
@@ -16,7 +16,7 @@ final class CoalesceAnalyzer
     /**
      * @var array<class-string<Expr>>
      */
-    private const ISSETABLE_EXPR = [
+    private const array ISSETABLE_EXPR = [
         Variable::class,
         ArrayDimFetch::class,
         PropertyFetch::class,
diff --git a/src/Set/ValueObject/DowngradeLevelSetList.php b/src/Set/ValueObject/DowngradeLevelSetList.php
@@ -10,48 +10,21 @@
  */
 final class DowngradeLevelSetList
 {
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_84 = __DIR__ . '/../../../config/set/level/down-to-php84.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_83 = __DIR__ . '/../../../config/set/level/down-to-php83.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_82 = __DIR__ . '/../../../config/set/level/down-to-php82.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_81 = __DIR__ . '/../../../config/set/level/down-to-php81.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_80 = __DIR__ . '/../../../config/set/level/down-to-php80.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_74 = __DIR__ . '/../../../config/set/level/down-to-php74.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_73 = __DIR__ . '/../../../config/set/level/down-to-php73.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_72 = __DIR__ . '/../../../config/set/level/down-to-php72.php';
-
-    /**
-     * @var string
-     */
-    public const DOWN_TO_PHP_71 = __DIR__ . '/../../../config/set/level/down-to-php71.php';
+    public const string DOWN_TO_PHP_84 = __DIR__ . '/../../../config/set/level/down-to-php84.php';
+
+    public const string DOWN_TO_PHP_83 = __DIR__ . '/../../../config/set/level/down-to-php83.php';
+
+    public const string DOWN_TO_PHP_82 = __DIR__ . '/../../../config/set/level/down-to-php82.php';
+
+    public const string DOWN_TO_PHP_81 = __DIR__ . '/../../../config/set/level/down-to-php81.php';
+
+    public const string DOWN_TO_PHP_80 = __DIR__ . '/../../../config/set/level/down-to-php80.php';
+
+    public const string DOWN_TO_PHP_74 = __DIR__ . '/../../../config/set/level/down-to-php74.php';
+
+    public const string DOWN_TO_PHP_73 = __DIR__ . '/../../../config/set/level/down-to-php73.php';
+
+    public const string DOWN_TO_PHP_72 = __DIR__ . '/../../../config/set/level/down-to-php72.php';
+
+    public const string DOWN_TO_PHP_71 = __DIR__ . '/../../../config/set/level/down-to-php71.php';
 }
diff --git a/src/Set/ValueObject/DowngradeSetList.php b/src/Set/ValueObject/DowngradeSetList.php
