From f0d4236c226fc4a828f4b714a55ee15e85183a1e Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 25 Oct 2026 23:41:45 +0100 Subject: [PATCH] deprecate PhpVersionFeature, use PhpVersion constants directly in rules --- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/php_72.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/typed_properties.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/multiple_call_configured_rule.php | 4 ++-- .../config/nested_attributes_php81.php | 4 ++-- .../ReadOnlyClassRector/config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/union_types.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../configured_rule_with_treat_classes_as_final.php | 4 ++-- .../config/intersection_config.php | 4 ++-- .../config/union_config.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/union_config.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../ReturnNeverTypeRector/config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule_php82.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../ReturnTypeFromReturnNewRector/config/php74.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../ReturnUnionTypeRector/config/configured_rule.php | 4 ++-- .../config/configured_rule_true_in_union.php | 4 ++-- .../config/configured_rule_union_intersection.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/rule_config.php | 4 ++-- .../config/rule_config.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/complex_types.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../config/configured_rule_php82.php | 4 ++-- .../config/inline_public_configured_rule.php | 4 ++-- .../config/configured_rule.php | 4 ++-- .../Attribute/ExplicitAttributeNamedArgsRector.php | 4 ++-- .../CallLike/AddNameToBooleanArgumentRector.php | 4 ++-- .../Rector/CallLike/AddNameToNullArgumentRector.php | 4 ++-- .../OptionalParametersAfterRequiredRector.php | 4 ++-- ...adonlyPropertyVisibilityOnReadonlyClassRector.php | 4 ++-- .../Foreach_/SimplifyForeachToCoalescingRector.php | 4 ++-- ...veNullCompareReturnsToNullCoalesceQueueRector.php | 4 ++-- .../CleanupUnneededNullsafeOperatorRector.php | 4 ++-- ...ctionDelegatingCallToFirstClassCallableRector.php | 4 ++-- .../Rector/ClassConst/RemoveFinalFromConstRector.php | 4 ++-- .../ClassMethod/FuncGetArgsToVariadicParamRector.php | 4 ++-- ...osureDelegatingCallToFirstClassCallableRector.php | 4 ++-- .../FuncCall/CallUserFuncArrayToVariadicRector.php | 4 ++-- ...ClosureFromCallableToFirstClassCallableRector.php | 4 ++-- .../RemoveUnusedPromotedPropertyRector.php | 4 ++-- .../RemoveUselessUnionReturnDocblockRector.php | 4 ++-- .../FunctionLike/NarrowWideUnionReturnTypeRector.php | 4 ++-- .../Property/RemoveUselessReadOnlyTagRector.php | 4 ++-- .../Rector/Property/VarToPublicPropertyRector.php | 4 ++-- .../Rector/Switch_/ContinueToBreakInSwitchRector.php | 4 ++-- .../DirNameFileConstantToDirConstantRector.php | 4 ++-- rules/Php53/Rector/Ternary/TernaryToElvisRector.php | 4 ++-- .../Variable/ReplaceHttpServerVarsByServerRector.php | 4 ++-- .../Rector/Array_/LongArrayToShortArrayRector.php | 4 ++-- .../Rector/Break_/RemoveZeroBreakContinueRector.php | 4 ++-- .../FuncCall/RemoveReferenceFromCallRector.php | 4 ++-- .../StaticToSelfOnFinalClassRector.php | 4 ++-- .../Rector/Class_/ClassConstantToSelfClassRector.php | 4 ++-- .../FuncCall/GetCalledClassToSelfClassRector.php | 4 ++-- .../FuncCall/GetCalledClassToStaticClassRector.php | 4 ++-- .../Rector/FuncCall/PregReplaceEModifierRector.php | 4 ++-- .../String_/StringClassNameToClassConstantRector.php | 4 ++-- rules/Php56/Rector/FuncCall/PowToExpRector.php | 4 ++-- rules/Php70/Rector/Assign/ListSplitStringRector.php | 4 ++-- .../Php70/Rector/Assign/ListSwapArrayOrderRector.php | 4 ++-- .../Break_/BreakNotInLoopOrSwitchToReturnRector.php | 4 ++-- .../Rector/ClassMethod/Php4ConstructorRector.php | 4 ++-- rules/Php70/Rector/FuncCall/CallUserMethodRector.php | 4 ++-- .../Php70/Rector/FuncCall/EregToPregMatchRector.php | 4 ++-- rules/Php70/Rector/FuncCall/MultiDirnameRector.php | 4 ++-- rules/Php70/Rector/FuncCall/RandomFunctionRector.php | 4 ++-- .../FuncCall/RenameMktimeWithoutArgsToTimeRector.php | 4 ++-- .../FunctionLike/ExceptionHandlerTypehintRector.php | 4 ++-- rules/Php70/Rector/If_/IfToSpaceshipRector.php | 4 ++-- rules/Php70/Rector/List_/EmptyListRector.php | 4 ++-- .../ThisCallOnStaticMethodToStaticCallRector.php | 4 ++-- .../StaticCallOnNonStaticToInstanceCallRector.php | 4 ++-- .../IfIssetToCoalescingRector.php | 4 ++-- .../Switch_/ReduceMultipleDefaultSwitchRector.php | 4 ++-- .../Rector/Ternary/TernaryToNullCoalescingRector.php | 4 ++-- .../Rector/Ternary/TernaryToSpaceshipRector.php | 4 ++-- .../WrapVariableVariableNameInCurlyBracesRector.php | 4 ++-- .../Rector/Assign/AssignArrayToStringRector.php | 4 ++-- .../BinaryOpBetweenNumberAndStringRector.php | 4 ++-- rules/Php71/Rector/BooleanOr/IsIterableRector.php | 6 +++--- .../Rector/FuncCall/RemoveExtraParametersRector.php | 4 ++-- .../Php71/Rector/List_/ListToArrayDestructRector.php | 4 ++-- .../Rector/TryCatch/MultiExceptionCatchRector.php | 4 ++-- rules/Php72/Rector/Assign/ListEachRector.php | 4 ++-- .../ReplaceEachAssignmentWithKeyCurrentRector.php | 4 ++-- .../CreateFunctionToAnonymousFunctionRector.php | 4 ++-- rules/Php72/Rector/FuncCall/GetClassOnNullRector.php | 4 ++-- .../FuncCall/ParseStrWithResultArgumentRector.php | 4 ++-- .../Php72/Rector/FuncCall/StringifyDefineRector.php | 4 ++-- .../Rector/FuncCall/StringsAssertNakedRector.php | 4 ++-- rules/Php72/Rector/Unset_/UnsetCastRector.php | 4 ++-- .../Php72/Rector/While_/WhileEachToForeachRector.php | 4 ++-- rules/Php73/Rector/BooleanOr/IsCountableRector.php | 4 ++-- .../ConstFetch/SensitiveConstantNameRector.php | 4 ++-- .../Rector/FuncCall/ArrayKeyFirstLastRector.php | 4 ++-- .../FuncCall/ArrayKeysToArrayKeyFirstLastRector.php | 4 ++-- .../Php73/Rector/FuncCall/JsonThrowOnErrorRector.php | 4 ++-- .../Php73/Rector/FuncCall/RegexDashEscapeRector.php | 4 ++-- .../Php73/Rector/FuncCall/SensitiveDefineRector.php | 4 ++-- rules/Php73/Rector/FuncCall/SetCookieRector.php | 4 ++-- .../Rector/FuncCall/StringifyStrNeedlesRector.php | 4 ++-- .../Rector/String_/SensitiveHereNowDocRector.php | 4 ++-- .../CurlyToSquareBracketArrayStringRector.php | 4 ++-- .../Rector/Assign/NullCoalescingOperatorRector.php | 4 ++-- .../Rector/Closure/ClosureToArrowFunctionRector.php | 4 ++-- .../FuncCall/ArrayKeyExistsOnPropertyRector.php | 4 ++-- .../Rector/FuncCall/FilterVarToAddSlashesRector.php | 4 ++-- .../Rector/FuncCall/HebrevcToNl2brHebrevRector.php | 4 ++-- .../MbStrrposEncodingArgumentPositionRector.php | 4 ++-- .../FuncCall/MoneyFormatToNumberFormatRector.php | 4 ++-- .../RestoreIncludePathToIniRestoreRector.php | 4 ++-- .../Rector/If_/IfToNullCoalescingAssignRector.php | 4 ++-- ...estoreDefaultNullToNullableTypePropertyRector.php | 4 ++-- .../StaticCall/ExportToReflectionFunctionRector.php | 4 ++-- .../Ternary/ParenthesizeNestedTernaryRector.php | 4 ++-- .../Catch_/RemoveUnusedVariableInCatchRector.php | 4 ++-- .../ClassOnThisVariableObjectRector.php | 4 ++-- .../AddParamBasedOnParentClassMethodRector.php | 4 ++-- .../FinalPrivateToPrivateVisibilityRector.php | 4 ++-- .../Rector/ClassMethod/SetStateToStaticRector.php | 4 ++-- .../Rector/Class_/AnnotationToAttributeRector.php | 4 ++-- ...assPropertyAssignToConstructorPromotionRector.php | 4 ++-- .../Rector/Class_/StringableForToStringRector.php | 4 ++-- rules/Php80/Rector/FuncCall/ClassOnObjectRector.php | 4 ++-- rules/Php80/Rector/Identical/StrEndsWithRector.php | 4 ++-- rules/Php80/Rector/Identical/StrStartsWithRector.php | 4 ++-- .../Rector/NotIdentical/MbStrContainsRector.php | 4 ++-- .../Php80/Rector/NotIdentical/StrContainsRector.php | 4 ++-- .../Rector/Switch_/ChangeSwitchToMatchRector.php | 4 ++-- rules/Php80/Rector/Ternary/GetDebugTypeRector.php | 4 ++-- .../Ternary/TernaryToNullsafeCoalesceRector.php | 4 ++-- .../Php81/Rector/Class_/MyCLabsClassToEnumRector.php | 4 ++-- .../Rector/Class_/SpatieEnumClassToEnumRector.php | 4 ++-- ...NullToStrictIntPregSlitFuncCallLimitArgRector.php | 4 ++-- .../FuncCall/NullToStrictStringFuncCallArgRector.php | 4 ++-- .../MyCLabsMethodCallToEnumConstRector.php | 4 ++-- .../SpatieEnumMethodCallToEnumConstRector.php | 4 ++-- .../New_/MyCLabsConstructorCallToEnumFromRector.php | 4 ++-- .../Php81/Rector/Property/ReadOnlyPropertyRector.php | 4 ++-- rules/Php82/Rector/Class_/ReadOnlyClassRector.php | 4 ++-- .../VariableInStringInterpolationFixerRector.php | 4 ++-- .../Utf8DecodeEncodeToMbConvertEncodingRector.php | 4 ++-- .../Rector/New_/FilesystemIteratorSkipDotsRector.php | 4 ++-- .../Param/AddSensitiveParameterAttributeRector.php | 4 ++-- rules/Php83/Rector/BooleanAnd/JsonValidateRector.php | 4 ++-- .../Php83/Rector/ClassConst/AddTypeToConstRector.php | 4 ++-- ...AddOverrideAttributeToOverriddenMethodsRector.php | 4 ++-- .../Rector/Class_/ReadOnlyAnonymousClassRector.php | 4 ++-- .../Rector/FuncCall/CombineHostPortLdapUriRector.php | 4 ++-- .../Rector/FuncCall/DynamicClassConstFetchRector.php | 4 ++-- .../RemoveGetClassGetParentClassNoArgsRector.php | 4 ++-- ...precatedAnnotationToDeprecatedAttributeRector.php | 4 ++-- rules/Php84/Rector/Class_/PropertyHookRector.php | 4 ++-- .../Rector/Foreach_/ForeachToArrayAllRector.php | 4 ++-- .../Rector/Foreach_/ForeachToArrayAnyRector.php | 4 ++-- .../Rector/Foreach_/ForeachToArrayFindKeyRector.php | 4 ++-- .../Rector/Foreach_/ForeachToArrayFindRector.php | 4 ++-- .../Rector/FuncCall/AddEscapeArgumentRector.php | 4 ++-- .../Php84/Rector/FuncCall/RoundingModeEnumRector.php | 4 ++-- .../NewMethodCallWithoutParenthesesRector.php | 4 ++-- .../Rector/Param/ExplicitNullableParamTypeRector.php | 4 ++-- .../Rector/ArrayDimFetch/ArrayFirstLastRector.php | 4 ++-- .../Rector/ClassMethod/NullDebugInfoReturnRector.php | 4 ++-- rules/Php85/Rector/Class_/SleepToSerializeRector.php | 4 ++-- .../Rector/Class_/WakeupToUnserializeRector.php | 4 ++-- .../NestedFuncCallsToPipeOperatorRector.php | 4 ++-- .../ArrayKeyExistsNullToEmptyStringRector.php | 4 ++-- rules/Php85/Rector/FuncCall/ChrArgModuloRector.php | 4 ++-- rules/Php85/Rector/FuncCall/OrdSingleByteRector.php | 4 ++-- .../FuncCall/RemoveFinfoBufferContextArgRector.php | 4 ++-- ...OverrideAttributeToOverriddenPropertiesRector.php | 4 ++-- .../ShellExecFunctionCallOverBackticksRector.php | 4 ++-- .../SequentialAssignmentsToPipeOperatorRector.php | 4 ++-- .../Rector/Switch_/ColonAfterSwitchCaseRector.php | 4 ++-- .../ConstructorReadonlyAssignToDefaultRector.php | 4 ++-- rules/Php86/Rector/FuncCall/MinMaxToClampRector.php | 4 ++-- .../Renaming/Rector/Class_/RenameAttributeRector.php | 4 ++-- .../NodeTypeAnalyzer/PropertyTypeDecorator.php | 4 ++-- .../AddArrowFunctionReturnTypeRector.php | 4 ++-- .../AddVoidReturnTypeWhereNoReturnRector.php | 4 ++-- .../ClassMethod/AddParamTypeDeclarationRector.php | 4 ++-- .../AddParamTypeFromPropertyTypeRector.php | 4 ++-- ...TypeDeclarationBasedOnParentClassMethodRector.php | 6 +++--- .../ClassMethod/AddReturnTypeDeclarationRector.php | 4 ++-- ...urnTypeFromBooleanConstAndStrictReturnsRector.php | 4 ++-- .../BoolReturnTypeFromBooleanConstReturnsRector.php | 4 ++-- .../BoolReturnTypeFromBooleanStrictReturnsRector.php | 4 ++-- .../ClassMethod/KnownMagicClassMethodTypeRector.php | 8 ++++---- .../NumericReturnTypeFromStrictReturnsRector.php | 4 ++-- ...umericReturnTypeFromStrictScalarReturnsRector.php | 4 ++-- .../Rector/ClassMethod/ReturnNeverTypeRector.php | 4 ++-- .../Rector/ClassMethod/ReturnNullableTypeRector.php | 4 ++-- .../ClassMethod/ReturnTypeFromReturnCastRector.php | 4 ++-- .../ReturnTypeFromReturnDirectArrayRector.php | 4 ++-- .../ClassMethod/ReturnTypeFromReturnNewRector.php | 4 ++-- .../ReturnTypeFromStrictFluentReturnRector.php | 6 +++--- .../ClassMethod/ReturnTypeFromStrictParamRector.php | 4 ++-- .../ReturnTypeFromStrictTypedCallRector.php | 6 +++--- .../ReturnTypeFromStrictTypedPropertyRector.php | 4 ++-- .../ReturnTypeFromSymfonySerializerRector.php | 4 ++-- .../Rector/ClassMethod/ReturnUnionTypeRector.php | 4 ++-- .../ClassMethod/StrictStringParamConcatRector.php | 4 ++-- .../AddTestsVoidReturnTypeWhereNoReturnRector.php | 4 ++-- .../MergeDateTimePropertyTypeDeclarationRector.php | 4 ++-- ...dPropertyFromJMSSerializerAttributeTypeRector.php | 4 ++-- .../PropertyTypeFromStrictSetterGetterRector.php | 4 ++-- .../Rector/Class_/ReturnTypeFromMockObjectRector.php | 4 ++-- .../Class_/ReturnTypeFromStrictTernaryRector.php | 4 ++-- ...dPropertyFromJMSSerializerAttributeTypeRector.php | 4 ++-- .../TypedPropertyFromContainerGetSetUpRector.php | 4 ++-- .../TypedPropertyFromCreateMockAssignRector.php | 4 ++-- .../TypedPropertyFromDocblockSetUpDefinedRector.php | 4 ++-- .../TypedPropertyFromGetRepositorySetUpRector.php | 4 ++-- .../Closure/AddClosureNeverReturnTypeRector.php | 4 ++-- .../AddClosureVoidReturnTypeWhereNoReturnRector.php | 4 ++-- .../ClosureReturnTypeFromAssertInstanceOfRector.php | 4 ++-- .../Rector/Closure/ClosureReturnTypeRector.php | 4 ++-- .../AddArrayAnyAllClosureParamTypeRector.php | 4 ++-- .../AddArrayFunctionClosureParamTypeRector.php | 4 ++-- ...AddArrowFunctionParamArrayWhereDimFetchRector.php | 4 ++-- .../NarrowArrayAnyAllNullableParamTypeRector.php | 4 ++-- .../AddReturnTypeDeclarationFromYieldsRector.php | 4 ++-- .../AddFunctionVoidReturnTypeWhereNoReturnRector.php | 4 ++-- .../Property/TypedPropertyFromAssignsRector.php | 4 ++-- .../TypedPropertyFromStrictConstructorRector.php | 4 ++-- .../Property/TypedPropertyFromStrictSetUpRector.php | 4 ++-- src/NodeDecorator/PropertyTypeDecorator.php | 4 ++-- src/NodeManipulator/ClassDependencyManipulator.php | 6 +++--- .../TypeMapper/AccessoryStringTypeMapper.php | 4 ++-- .../TypeMapper/BooleanTypeMapper.php | 6 +++--- .../TypeMapper/ClassStringTypeMapper.php | 4 ++-- .../TypeMapper/ClosureTypeMapper.php | 10 +++++----- .../TypeMapper/ConstantArrayTypeMapper.php | 4 ++-- .../TypeMapper/FloatTypeMapper.php | 4 ++-- .../TypeMapper/IntegerTypeMapper.php | 4 ++-- .../TypeMapper/IntersectionTypeMapper.php | 6 +++--- .../TypeMapper/MixedTypeMapper.php | 4 ++-- .../TypeMapper/NullTypeMapper.php | 6 +++--- .../TypeMapper/ObjectWithoutClassTypeMapper.php | 4 ++-- .../TypeMapper/StaticTypeMapper.php | 4 ++-- .../TypeMapper/StrictMixedTypeMapper.php | 4 ++-- .../TypeMapper/StringTypeMapper.php | 4 ++-- .../TypeMapper/TypeWithClassNameTypeMapper.php | 4 ++-- .../TypeMapper/UnionTypeMapper.php | 12 ++++++------ .../TypeMapper/VoidTypeMapper.php | 4 ++-- ...DoctrineAnnotationAnnotationToAttributeMapper.php | 4 ++-- src/PhpParser/Node/NodeFactory.php | 4 ++-- src/ValueObject/PhpVersionFeature.php | 4 ++++ .../Rule/ExtbaseAnnotationToAttributeRector.php | 4 ++-- tests/Issues/Issue9388/config/configured_rule.php | 6 +++--- .../config/array_annotation_to_attribute.php | 4 ++-- .../ClassDependencyManipulatorTest.php | 3 +-- 282 files changed, 583 insertions(+), 580 deletions(-) diff --git a/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/config/configured_rule.php index 830716c9645..00c997ae743 100644 --- a/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/Class_/ConvertStaticToSelfRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\CodeQuality\Rector\Class_\ConvertStaticToSelfRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([ConvertStaticToSelfRector::class]) - ->withPhpVersion(PhpVersionFeature::FINAL_CLASS_CONSTANTS); + ->withPhpVersion(PhpVersion::PHP_81); diff --git a/rules-tests/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector/config/configured_rule.php index 25508edfec7..e7f07b28150 100644 --- a/rules-tests/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector/config/configured_rule.php +++ b/rules-tests/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\CodeQuality\Rector\NullsafeMethodCall\CleanupUnneededNullsafeOperatorRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::NULLSAFE_OPERATOR); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(CleanupUnneededNullsafeOperatorRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/config/configured_rule.php index e709859ccb2..fa0ec141733 100644 --- a/rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([ArrowFunctionDelegatingCallToFirstClassCallableRector::class]) - ->withPhpVersion(PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX); + ->withPhpVersion(PhpVersion::PHP_81); diff --git a/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php index a82f754285d..565a21c88ba 100644 --- a/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::FINAL_CLASS_CONSTANTS); + $rectorConfig->phpVersion(PhpVersion::PHP_81); $rectorConfig->rule(RemoveFinalFromConstRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php index 886e7b23e78..3a0158471cf 100644 --- a/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php +++ b/rules-tests/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector/config/php_72.php @@ -4,9 +4,9 @@ use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::PARENT_VISIBILITY_OVERRIDE); + $rectorConfig->phpVersion(PhpVersion::PHP_72); $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class); }; diff --git a/rules-tests/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector/config/configured_rule.php index db98334e405..63ce8004959 100644 --- a/rules-tests/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector/config/configured_rule.php +++ b/rules-tests/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\CodingStyle\Rector\Closure\ClosureDelegatingCallToFirstClassCallableRector; use Rector\Config\RectorConfig; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([ClosureDelegatingCallToFirstClassCallableRector::class]) - ->withPhpVersion(PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX); + ->withPhpVersion(PhpVersion::PHP_81); diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php index 25fa68546fe..df45eb78286 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::PROPERTY_PROMOTION); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(RemoveUnusedPromotedPropertyRector::class); }; diff --git a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector/config/configured_rule.php index 04139295eb0..73b3be03f65 100644 --- a/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessUnionReturnDocblockRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() - ->withPhpVersion(PhpVersionFeature::UNION_TYPES) + ->withPhpVersion(PhpVersion::PHP_80) ->withRules([RemoveUselessUnionReturnDocblockRector::class]); diff --git a/rules-tests/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector/config/configured_rule.php b/rules-tests/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector/config/configured_rule.php index e64ea99b6e6..bc44a91d951 100644 --- a/rules-tests/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector/config/configured_rule.php +++ b/rules-tests/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector/config/configured_rule.php @@ -5,7 +5,7 @@ use Rector\Composer\ComposerJsonPackageVersionResolver; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\FunctionLike\NarrowWideUnionReturnTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->singleton( @@ -15,5 +15,5 @@ ) ); $rectorConfig->rule(NarrowWideUnionReturnTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php index 70c1c5b5c0f..1fff55dbfa1 100644 --- a/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php +++ b/rules-tests/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector/config/typed_properties.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::TYPED_PROPERTIES); + $rectorConfig->phpVersion(PhpVersion::PHP_74); $rectorConfig->rule(RemoveNullPropertyInitializationRector::class); }; diff --git a/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php b/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php index 269e8daab4f..fe2cd5ebedf 100644 --- a/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php +++ b/rules-tests/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\Php74\Rector\ArrayDimFetch\CurlyToSquareBracketArrayStringRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::DEPRECATE_CURLY_BRACKET_ARRAY_STRING); + $rectorConfig->phpVersion(PhpVersion::PHP_74); $rectorConfig->rule(CurlyToSquareBracketArrayStringRector::class); }; diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/multiple_call_configured_rule.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/multiple_call_configured_rule.php index 013ec3b9de9..71d4195e6d2 100644 --- a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/multiple_call_configured_rule.php +++ b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/multiple_call_configured_rule.php @@ -5,10 +5,10 @@ use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig ->ruleWithConfiguration(AnnotationToAttributeRector::class, [ diff --git a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php index 6935f12ecb5..a575189de09 100644 --- a/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php +++ b/rules-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php @@ -12,11 +12,11 @@ use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\All; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\Length; use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\NotNumber; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { // covers https://wiki.php.net/rfc/new_in_initializers#nested_attributes - $rectorConfig->phpVersion(PhpVersionFeature::NEW_INITIALIZERS); + $rectorConfig->phpVersion(PhpVersion::PHP_81); $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [ new AnnotationToAttribute(All::class), diff --git a/rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/config/configured_rule.php b/rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/config/configured_rule.php index 214ae6058a9..23c02e25912 100644 --- a/rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/config/configured_rule.php +++ b/rules-tests/Php82/Rector/Class_/ReadOnlyClassRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\Php82\Rector\Class_\ReadOnlyClassRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReadOnlyClassRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::READONLY_CLASS); + $rectorConfig->phpVersion(PhpVersion::PHP_82); }; diff --git a/rules-tests/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector/config/configured_rule.php b/rules-tests/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector/config/configured_rule.php index ec46eb1ce1f..8967042a67c 100644 --- a/rules-tests/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector/config/configured_rule.php +++ b/rules-tests/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\Php82\Rector\Encapsed\VariableInStringInterpolationFixerRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::DEPRECATE_VARIABLE_IN_STRING_INTERPOLATION); + $rectorConfig->phpVersion(PhpVersion::PHP_82); $rectorConfig->rule(VariableInStringInterpolationFixerRector::class); }; diff --git a/rules-tests/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector/config/configured_rule.php b/rules-tests/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector/config/configured_rule.php index afd80430aca..b268e3e75bc 100644 --- a/rules-tests/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector/config/configured_rule.php +++ b/rules-tests/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\Php82\Rector\FuncCall\Utf8DecodeEncodeToMbConvertEncodingRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::DEPRECATE_UTF8_DECODE_ENCODE_FUNCTION); + $rectorConfig->phpVersion(PhpVersion::PHP_82); $rectorConfig->rule(Utf8DecodeEncodeToMbConvertEncodingRector::class); }; diff --git a/rules-tests/Php83/Rector/Class_/ReadOnlyAnonymousClassRector/config/configured_rule.php b/rules-tests/Php83/Rector/Class_/ReadOnlyAnonymousClassRector/config/configured_rule.php index d07e632bb60..1661cf0e687 100644 --- a/rules-tests/Php83/Rector/Class_/ReadOnlyAnonymousClassRector/config/configured_rule.php +++ b/rules-tests/Php83/Rector/Class_/ReadOnlyAnonymousClassRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\Php83\Rector\Class_\ReadOnlyAnonymousClassRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReadOnlyAnonymousClassRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::READONLY_ANONYMOUS_CLASS); + $rectorConfig->phpVersion(PhpVersion::PHP_83); }; diff --git a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/config/union_types.php b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/config/union_types.php index e410d41b58f..6934a274956 100644 --- a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/config/union_types.php +++ b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/config/union_types.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(AddArrowFunctionReturnTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php index e9d662f4fd6..9d386e17f27 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES - 1); + $rectorConfig->phpVersion(PhpVersion::PHP_80 - 1); $rectorConfig->rule(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule_with_treat_classes_as_final.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule_with_treat_classes_as_final.php index d2ef30bb41f..1c83ff122ea 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule_with_treat_classes_as_final.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/configured_rule_with_treat_classes_as_final.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(AddMethodCallBasedStrictParamTypeRector::class); $rectorConfig->treatClassesAsFinal(); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php index 5f335441e6d..f5cfaaf9c62 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::INTERSECTION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_81); $rectorConfig->rule(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php index 17e72de655d..1aa96ff88cd 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/union_config.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(AddMethodCallBasedStrictParamTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/configured_rule.php index f6952e1ffb2..945d0eb6b20 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(AddParamTypeBasedOnPHPUnitDataProviderRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES - 1); + $rectorConfig->phpVersion(PhpVersion::PHP_80 - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/union_config.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/union_config.php index 40a809d31f8..a8e28517ab8 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/union_config.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector/config/union_config.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(AddParamTypeBasedOnPHPUnitDataProviderRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php index 2f49b46d2ba..783b505c701 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector/config/configured_rule.php @@ -12,7 +12,7 @@ use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ParserInterface; use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector; use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig @@ -34,5 +34,5 @@ new AddParamTypeDeclaration(ParentTypeToMixed::class, 'process', 0, new MixedType(true)), ]); - $rectorConfig->phpVersion(PhpVersionFeature::MIXED_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector/config/configured_rule.php index 131035076b0..34e63739f14 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(AddReturnTypeDeclarationBasedOnParentClassMethodRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::MIXED_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector/config/configured_rule.php index 270b20ad471..7f419bfb383 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\KnownMagicClassMethodTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([KnownMagicClassMethodTypeRector::class]) - ->withPhpVersion(PhpVersionFeature::MIXED_TYPE); + ->withPhpVersion(PhpVersion::PHP_80); diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php index 76810260f98..da8ab3233e4 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::NEVER_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_81); $rectorConfig->rule(ReturnNeverTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule.php index 8c108815356..b1115bc2064 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNullableTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnNullableTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::NULLABLE_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_71); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule_php82.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule_php82.php index a8bdff43c7b..16d57999a16 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule_php82.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector/config/configured_rule_php82.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNullableTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnNullableTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_82); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php index 8b191931111..58e5ac3002a 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnTypeFromReturnNewRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::STATIC_RETURN_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php index 8a2eadeedb3..fefb6edc61b 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector/config/php74.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnTypeFromReturnNewRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::STATIC_RETURN_TYPE - 1); + $rectorConfig->phpVersion(PhpVersion::PHP_80 - 1); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNativeCallRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNativeCallRector/config/configured_rule.php index 1ab94536212..8aeb195db9f 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNativeCallRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNativeCallRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeCallRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([ReturnTypeFromStrictNativeCallRector::class]) - ->withPhpVersion(PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE); + ->withPhpVersion(PhpVersion::PHP_82); diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php index 51aab0a5818..6ec9f86a00e 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(ReturnTypeFromStrictTypedPropertyRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector/config/configured_rule.php index 436e5307acc..8a9a89e7f7d 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromSymfonySerializerRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::HAS_RETURN_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_70); $rectorConfig->rule(ReturnTypeFromSymfonySerializerRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule.php index d1132dea29c..d4729d61fc3 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnUnionTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_true_in_union.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_true_in_union.php index 3870cf3c697..f5f43b0b9cf 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_true_in_union.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_true_in_union.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnUnionTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_82); }; diff --git a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_union_intersection.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_union_intersection.php index 576f52eb528..f5f43b0b9cf 100644 --- a/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_union_intersection.php +++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/config/configured_rule_union_intersection.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(ReturnUnionTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_INTERSECTION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_82); }; diff --git a/rules-tests/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector/config/configured_rule.php index d1c2edb328e..99e2391c05e 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::TYPED_PROPERTIES); + $rectorConfig->phpVersion(PhpVersion::PHP_74); $rectorConfig->rule(MergeDateTimePropertyTypeDeclarationRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php index a6a8c8c3f5a..f8a65c0aba0 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\ObjectTypedPropertyFromJMSSerializerAttributeTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(ObjectTypedPropertyFromJMSSerializerAttributeTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector/config/configured_rule.php index 6f1bf462898..105f494492c 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\ReturnTypeFromStrictTernaryRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::NULLABLE_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_71); $rectorConfig->rule(ReturnTypeFromStrictTernaryRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php index 0f9bb8c9da4..ec7a1f5a239 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\ScalarTypedPropertyFromJMSSerializerAttributeTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(ScalarTypedPropertyFromJMSSerializerAttributeTypeRector::class); }; diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector/config/configured_rule.php index 0a6b2032578..121ebacf19a 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromContainerGetSetUpRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([TypedPropertyFromContainerGetSetUpRector::class]) - ->withPhpVersion(PhpVersionFeature::TYPED_PROPERTIES); + ->withPhpVersion(PhpVersion::PHP_74); diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/config/rule_config.php b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/config/rule_config.php index e66249aab4c..45b9eeb0566 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/config/rule_config.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/config/rule_config.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([TypedPropertyFromCreateMockAssignRector::class]) - ->withPhpVersion(PhpVersionFeature::TYPED_PROPERTIES); + ->withPhpVersion(PhpVersion::PHP_74); diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector/config/rule_config.php b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector/config/rule_config.php index 88c338e2c6a..dd6c31530b7 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector/config/rule_config.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector/config/rule_config.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromDocblockSetUpDefinedRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([TypedPropertyFromDocblockSetUpDefinedRector::class]) - ->withPhpVersion(PhpVersionFeature::TYPED_PROPERTIES); + ->withPhpVersion(PhpVersion::PHP_74); diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector/config/configured_rule.php index 2716c15e189..68ef079058f 100644 --- a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromGetRepositorySetUpRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([TypedPropertyFromGetRepositorySetUpRector::class]) - ->withPhpVersion(PhpVersionFeature::TYPED_PROPERTIES); + ->withPhpVersion(PhpVersion::PHP_74); diff --git a/rules-tests/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector/config/configured_rule.php index 5b3b2dc481a..0a4800bdc1a 100644 --- a/rules-tests/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector/config/configured_rule.php @@ -4,9 +4,9 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Closure\AddClosureNeverReturnTypeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(AddClosureNeverReturnTypeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::NEVER_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_81); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php index 2d0ea1ab77c..82cb8eacf5a 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php @@ -4,8 +4,8 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeForArrayMapRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return RectorConfig::configure() ->withRules([AddClosureParamTypeForArrayMapRector::class]) - ->withPhpVersion(PhpVersionFeature::UNION_TYPES); + ->withPhpVersion(PhpVersion::PHP_80); diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector/config/configured_rule.php index d1ce575c26a..5efd593e50a 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector/config/configured_rule.php @@ -4,11 +4,11 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeForArrayReduceRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig ->rules([AddClosureParamTypeForArrayReduceRector::class]); - $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeFromIterableMethodCallRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeFromIterableMethodCallRector/config/configured_rule.php index 0929b75b79c..8d1cad282a8 100644 --- a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeFromIterableMethodCallRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeFromIterableMethodCallRector/config/configured_rule.php @@ -4,11 +4,11 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeFromIterableMethodCallRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig ->rules([AddClosureParamTypeFromIterableMethodCallRector::class]); - $rectorConfig->phpVersion(PhpVersionFeature::MIXED_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php index 2effe7d959d..82d036f3e98 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/complex_types.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(TypedPropertyFromAssignsRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::INTERSECTION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_81); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php index 6d027600a75..50e0c8b1966 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(TypedPropertyFromAssignsRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::TYPED_PROPERTIES); + $rectorConfig->phpVersion(PhpVersion::PHP_74); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule_php82.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule_php82.php index 7506f408a0b..c362917b2ce 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule_php82.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/configured_rule_php82.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(TypedPropertyFromAssignsRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE); + $rectorConfig->phpVersion(PhpVersion::PHP_82); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/inline_public_configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/inline_public_configured_rule.php index 31b561c6950..2420f1d4ff2 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/inline_public_configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/config/inline_public_configured_rule.php @@ -4,12 +4,12 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->ruleWithConfiguration(TypedPropertyFromAssignsRector::class, [ TypedPropertyFromAssignsRector::INLINE_PUBLIC => true, ]); - $rectorConfig->phpVersion(PhpVersionFeature::INTERSECTION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_81); }; diff --git a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php index e0a006272cf..5cbf4e81418 100644 --- a/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php +++ b/rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/config/configured_rule.php @@ -4,10 +4,10 @@ use Rector\Config\RectorConfig; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { $rectorConfig->rule(TypedPropertyFromStrictConstructorRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::INTERSECTION_TYPES); + $rectorConfig->phpVersion(PhpVersion::PHP_81); }; diff --git a/rules/CodeQuality/Rector/Attribute/ExplicitAttributeNamedArgsRector.php b/rules/CodeQuality/Rector/Attribute/ExplicitAttributeNamedArgsRector.php index c0f95436769..c7efe47db48 100644 --- a/rules/CodeQuality/Rector/Attribute/ExplicitAttributeNamedArgsRector.php +++ b/rules/CodeQuality/Rector/Attribute/ExplicitAttributeNamedArgsRector.php @@ -15,7 +15,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -92,7 +92,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NAMED_ARGUMENTS; + return PhpVersion::PHP_80; } /** diff --git a/rules/CodeQuality/Rector/CallLike/AddNameToBooleanArgumentRector.php b/rules/CodeQuality/Rector/CallLike/AddNameToBooleanArgumentRector.php index 99ed2bccba3..b4c74198a98 100644 --- a/rules/CodeQuality/Rector/CallLike/AddNameToBooleanArgumentRector.php +++ b/rules/CodeQuality/Rector/CallLike/AddNameToBooleanArgumentRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -65,6 +65,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NAMED_ARGUMENTS; + return PhpVersion::PHP_80; } } diff --git a/rules/CodeQuality/Rector/CallLike/AddNameToNullArgumentRector.php b/rules/CodeQuality/Rector/CallLike/AddNameToNullArgumentRector.php index 6d764529f61..03148e2a65e 100644 --- a/rules/CodeQuality/Rector/CallLike/AddNameToNullArgumentRector.php +++ b/rules/CodeQuality/Rector/CallLike/AddNameToNullArgumentRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -65,6 +65,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NAMED_ARGUMENTS; + return PhpVersion::PHP_80; } } diff --git a/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php b/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php index bb56a8b0ec8..eefb2735b36 100644 --- a/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php +++ b/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php @@ -24,7 +24,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -102,7 +102,7 @@ public function refactor(Node $node): ClassMethod|Function_|Closure|null public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLABLE_TYPE; + return PhpVersion::PHP_71; } /** diff --git a/rules/CodeQuality/Rector/Class_/RemoveReadonlyPropertyVisibilityOnReadonlyClassRector.php b/rules/CodeQuality/Rector/Class_/RemoveReadonlyPropertyVisibilityOnReadonlyClassRector.php index cdb310d9140..5418103c052 100644 --- a/rules/CodeQuality/Rector/Class_/RemoveReadonlyPropertyVisibilityOnReadonlyClassRector.php +++ b/rules/CodeQuality/Rector/Class_/RemoveReadonlyPropertyVisibilityOnReadonlyClassRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -27,7 +27,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_CLASS; + return PhpVersion::PHP_82; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php b/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php index bfc3860e372..26135d4e1c7 100644 --- a/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php +++ b/rules/CodeQuality/Rector/Foreach_/SimplifyForeachToCoalescingRector.php @@ -20,7 +20,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -138,7 +138,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE; + return PhpVersion::PHP_70; } /** diff --git a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php index 50e905aa001..19c7ea91080 100644 --- a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php +++ b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php @@ -18,7 +18,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -155,7 +155,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE; + return PhpVersion::PHP_70; } private function isReturnNull(Stmt $stmt): bool diff --git a/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php b/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php index eea699dbcf6..5a94a3ed907 100644 --- a/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php +++ b/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php @@ -15,7 +15,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeAnalyzer\ReturnStrictTypeAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -103,6 +103,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLSAFE_OPERATOR; + return PhpVersion::PHP_80; } } diff --git a/rules/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector.php b/rules/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector.php index 738a7320400..ea488ad0c1d 100644 --- a/rules/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector.php +++ b/rules/CodingStyle/Rector/ArrowFunction/ArrowFunctionDelegatingCallToFirstClassCallableRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -84,6 +84,6 @@ public function refactor(Node $node): null|CallLike public function provideMinPhpVersion(): int { - return PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX; + return PhpVersion::PHP_81; } } diff --git a/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php b/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php index 692cf930fca..eb647a53738 100644 --- a/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php +++ b/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -81,6 +81,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::FINAL_CLASS_CONSTANTS; + return PhpVersion::PHP_81; } } diff --git a/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php b/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php index 5c32ac0bc87..f2286f19a27 100644 --- a/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php @@ -18,7 +18,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -106,7 +106,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::VARIADIC_PARAM; + return PhpVersion::PHP_56; } /** diff --git a/rules/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector.php b/rules/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector.php index 2212a166d09..c9858fb6bee 100644 --- a/rules/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector.php +++ b/rules/CodingStyle/Rector/Closure/ClosureDelegatingCallToFirstClassCallableRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -92,6 +92,6 @@ public function refactor(Node $node): null|FuncCall|MethodCall|StaticCall public function provideMinPhpVersion(): int { - return PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX; + return PhpVersion::PHP_81; } } diff --git a/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php b/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php index 873f72ced11..5c1d982fb97 100644 --- a/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php +++ b/rules/CodingStyle/Rector/FuncCall/CallUserFuncArrayToVariadicRector.php @@ -16,7 +16,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -104,7 +104,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_SPREAD; + return PhpVersion::PHP_74; } private function createFuncCall(Expr $expr, string $functionName): FuncCall diff --git a/rules/CodingStyle/Rector/FuncCall/ClosureFromCallableToFirstClassCallableRector.php b/rules/CodingStyle/Rector/FuncCall/ClosureFromCallableToFirstClassCallableRector.php index 14b872e2cb3..95598856857 100644 --- a/rules/CodingStyle/Rector/FuncCall/ClosureFromCallableToFirstClassCallableRector.php +++ b/rules/CodingStyle/Rector/FuncCall/ClosureFromCallableToFirstClassCallableRector.php @@ -21,7 +21,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -117,7 +117,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX; + return PhpVersion::PHP_81; } public function shouldSkip(StaticCall $staticCall): bool diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php index c315a9192d1..c362127e35e 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPromotedPropertyRector.php @@ -24,7 +24,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\Visibility; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -162,7 +162,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::PROPERTY_PROMOTION; + return PhpVersion::PHP_80; } private function shouldSkipClass(Class_ $class): bool diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector.php index 681f9a4c7b1..6d0a660f2c0 100644 --- a/rules/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector.php +++ b/rules/DeadCode/Rector/ClassMethod/RemoveUselessUnionReturnDocblockRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -136,7 +136,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::UNION_TYPES; + return PhpVersion::PHP_80; } private function hasStaticOrThisType(UnionTypeNode $unionTypeNode): bool diff --git a/rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php b/rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php index 3c6f0e7714b..bc722073cee 100644 --- a/rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php +++ b/rules/DeadCode/Rector/FunctionLike/NarrowWideUnionReturnTypeRector.php @@ -39,7 +39,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -99,7 +99,7 @@ public function foo(): string|int public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLABLE_TYPE; + return PhpVersion::PHP_71; } /** diff --git a/rules/DeadCode/Rector/Property/RemoveUselessReadOnlyTagRector.php b/rules/DeadCode/Rector/Property/RemoveUselessReadOnlyTagRector.php index 367f4ab137f..28f1b01d806 100644 --- a/rules/DeadCode/Rector/Property/RemoveUselessReadOnlyTagRector.php +++ b/rules/DeadCode/Rector/Property/RemoveUselessReadOnlyTagRector.php @@ -16,7 +16,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -110,6 +110,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_PROPERTY; + return PhpVersion::PHP_81; } } diff --git a/rules/Php52/Rector/Property/VarToPublicPropertyRector.php b/rules/Php52/Rector/Property/VarToPublicPropertyRector.php index 19bb925cdc6..909b73bde7b 100644 --- a/rules/Php52/Rector/Property/VarToPublicPropertyRector.php +++ b/rules/Php52/Rector/Property/VarToPublicPropertyRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -25,7 +25,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::PROPERTY_MODIFIER; + return PhpVersion::PHP_52; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php b/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php index 918f8ea0b66..f1f943baf8b 100644 --- a/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php +++ b/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php @@ -25,7 +25,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -42,7 +42,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::CONTINUE_TO_BREAK; + return PhpVersion::PHP_52; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php b/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php index 188887e9a30..d3e50236969 100644 --- a/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php +++ b/rules/Php53/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -86,6 +86,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DIR_CONSTANT; + return PhpVersion::PHP_53; } } diff --git a/rules/Php53/Rector/Ternary/TernaryToElvisRector.php b/rules/Php53/Rector/Ternary/TernaryToElvisRector.php index 933799214b7..a76afb16c57 100644 --- a/rules/Php53/Rector/Ternary/TernaryToElvisRector.php +++ b/rules/Php53/Rector/Ternary/TernaryToElvisRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -72,7 +72,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ELVIS_OPERATOR; + return PhpVersion::PHP_53; } private function isParenthesized(Expr $ifExpr, Expr $elseExpr): bool diff --git a/rules/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector.php b/rules/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector.php index 5151439e358..6ade28cdbd2 100644 --- a/rules/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector.php +++ b/rules/Php53/Rector/Variable/ReplaceHttpServerVarsByServerRector.php @@ -9,7 +9,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -32,7 +32,7 @@ final class ReplaceHttpServerVarsByServerRector extends AbstractRector implement public function provideMinPhpVersion(): int { - return PhpVersionFeature::SERVER_VAR; + return PhpVersion::PHP_53; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php b/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php index 24ef58a12ea..cc89209ea72 100644 --- a/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php +++ b/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -20,7 +20,7 @@ final class LongArrayToShortArrayRector extends AbstractRector implements MinPhp { public function provideMinPhpVersion(): int { - return PhpVersionFeature::SHORT_ARRAY; + return PhpVersion::PHP_54; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php54/Rector/Break_/RemoveZeroBreakContinueRector.php b/rules/Php54/Rector/Break_/RemoveZeroBreakContinueRector.php index 0aab61a89e6..bca3022b22a 100644 --- a/rules/Php54/Rector/Break_/RemoveZeroBreakContinueRector.php +++ b/rules/Php54/Rector/Break_/RemoveZeroBreakContinueRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -30,7 +30,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_ZERO_BREAK; + return PhpVersion::PHP_54; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php b/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php index 51a56d390e5..805a6fce319 100644 --- a/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php +++ b/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -22,7 +22,7 @@ final class RemoveReferenceFromCallRector extends AbstractRector implements MinP { public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_REFERENCE_IN_ARG; + return PhpVersion::PHP_54; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php55/Rector/ClassConstFetch/StaticToSelfOnFinalClassRector.php b/rules/Php55/Rector/ClassConstFetch/StaticToSelfOnFinalClassRector.php index 2d4515c6f2e..11ee368f5d6 100644 --- a/rules/Php55/Rector/ClassConstFetch/StaticToSelfOnFinalClassRector.php +++ b/rules/Php55/Rector/ClassConstFetch/StaticToSelfOnFinalClassRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -91,6 +91,6 @@ public function refactor(Node $node): ?Class_ public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASSNAME_CONSTANT; + return PhpVersion::PHP_55; } } diff --git a/rules/Php55/Rector/Class_/ClassConstantToSelfClassRector.php b/rules/Php55/Rector/Class_/ClassConstantToSelfClassRector.php index 855475cdc56..1ffaf75aaf7 100644 --- a/rules/Php55/Rector/Class_/ClassConstantToSelfClassRector.php +++ b/rules/Php55/Rector/Class_/ClassConstantToSelfClassRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -63,6 +63,6 @@ public function refactor(Node $node): ClassConstFetch public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASSNAME_CONSTANT; + return PhpVersion::PHP_55; } } diff --git a/rules/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector.php b/rules/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector.php index 80eef0a1250..d2d31e0bd58 100644 --- a/rules/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector.php +++ b/rules/Php55/Rector/FuncCall/GetCalledClassToSelfClassRector.php @@ -13,7 +13,7 @@ use Rector\Reflection\ClassModifierChecker; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -92,6 +92,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASSNAME_CONSTANT; + return PhpVersion::PHP_55; } } diff --git a/rules/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector.php b/rules/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector.php index b16f12e9fcf..b0cdc9b42fe 100644 --- a/rules/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector.php +++ b/rules/Php55/Rector/FuncCall/GetCalledClassToStaticClassRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -82,6 +82,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASSNAME_CONSTANT; + return PhpVersion::PHP_55; } } diff --git a/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php b/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php index d2215506614..431c95fc820 100644 --- a/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php +++ b/rules/Php55/Rector/FuncCall/PregReplaceEModifierRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -31,7 +31,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::PREG_REPLACE_CALLBACK_E_MODIFIER; + return PhpVersion::PHP_55; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php index 82e7ff7a7a9..2a2ce2162d3 100644 --- a/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php +++ b/rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Webmozart\Assert\Assert; @@ -115,7 +115,7 @@ public function configure(array $configuration): void public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASSNAME_CONSTANT; + return PhpVersion::PHP_55; } private function shouldSkip(string $classLikeName): bool diff --git a/rules/Php56/Rector/FuncCall/PowToExpRector.php b/rules/Php56/Rector/FuncCall/PowToExpRector.php index c5dc9e4f343..cce3b5d277a 100644 --- a/rules/Php56/Rector/FuncCall/PowToExpRector.php +++ b/rules/Php56/Rector/FuncCall/PowToExpRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -60,7 +60,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::EXP_OPERATOR; + return PhpVersion::PHP_56; } private function createPow(FuncCall $funcCall): ?Pow diff --git a/rules/Php70/Rector/Assign/ListSplitStringRector.php b/rules/Php70/Rector/Assign/ListSplitStringRector.php index fe3606c12c2..c3afed55fd2 100644 --- a/rules/Php70/Rector/Assign/ListSplitStringRector.php +++ b/rules/Php70/Rector/Assign/ListSplitStringRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -28,7 +28,7 @@ public function getRuleDefinition(): RuleDefinition public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_LIST_SPLIT_STRING; + return PhpVersion::PHP_70; } /** diff --git a/rules/Php70/Rector/Assign/ListSwapArrayOrderRector.php b/rules/Php70/Rector/Assign/ListSwapArrayOrderRector.php index 68987e4658f..6f36e9a300d 100644 --- a/rules/Php70/Rector/Assign/ListSwapArrayOrderRector.php +++ b/rules/Php70/Rector/Assign/ListSwapArrayOrderRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -48,6 +48,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::LIST_SWAP_ORDER; + return PhpVersion::PHP_70; } } diff --git a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php index 740f5302b3d..edec4880269 100644 --- a/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php +++ b/rules/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -27,7 +27,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_BREAK_OUTSIDE_LOOP; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php index 604baf5584d..af3c47cf9d6 100644 --- a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php +++ b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php @@ -22,7 +22,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -38,7 +38,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_PHP4_CONSTRUCTOR; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/FuncCall/CallUserMethodRector.php b/rules/Php70/Rector/FuncCall/CallUserMethodRector.php index 799b4f84117..5bf08360843 100644 --- a/rules/Php70/Rector/FuncCall/CallUserMethodRector.php +++ b/rules/Php70/Rector/FuncCall/CallUserMethodRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -29,7 +29,7 @@ final class CallUserMethodRector extends AbstractRector implements MinPhpVersion public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_CALL_USER_METHOD; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php index b8c60e3f3ed..f98fcab1fc3 100644 --- a/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php +++ b/rules/Php70/Rector/FuncCall/EregToPregMatchRector.php @@ -20,7 +20,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Webmozart\Assert\Assert; @@ -48,7 +48,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_EREG_FUNCTION; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/FuncCall/MultiDirnameRector.php b/rules/Php70/Rector/FuncCall/MultiDirnameRector.php index 645e9316f2c..aac2e622c59 100644 --- a/rules/Php70/Rector/FuncCall/MultiDirnameRector.php +++ b/rules/Php70/Rector/FuncCall/MultiDirnameRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -72,7 +72,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DIRNAME_LEVELS; + return PhpVersion::PHP_70; } private function shouldSkip(): bool diff --git a/rules/Php70/Rector/FuncCall/RandomFunctionRector.php b/rules/Php70/Rector/FuncCall/RandomFunctionRector.php index a4c62ff4232..b6ca86ee062 100644 --- a/rules/Php70/Rector/FuncCall/RandomFunctionRector.php +++ b/rules/Php70/Rector/FuncCall/RandomFunctionRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -91,6 +91,6 @@ public function refactor(Node $node): FuncCall|null public function provideMinPhpVersion(): int { - return PhpVersionFeature::CSPRNG_FUNCTIONS; + return PhpVersion::PHP_70; } } diff --git a/rules/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php b/rules/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php index e2eb6641ba8..d702cfbe762 100644 --- a/rules/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php +++ b/rules/Php70/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -52,7 +52,7 @@ public function run() public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_MKTIME_WITHOUT_ARG; + return PhpVersion::PHP_70; } /** diff --git a/rules/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector.php b/rules/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector.php index 9f1019f92b7..6f54b5016d6 100644 --- a/rules/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector.php +++ b/rules/Php70/Rector/FunctionLike/ExceptionHandlerTypehintRector.php @@ -13,7 +13,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\Util\StringUtils; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -93,6 +93,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::THROWABLE_TYPE; + return PhpVersion::PHP_70; } } diff --git a/rules/Php70/Rector/If_/IfToSpaceshipRector.php b/rules/Php70/Rector/If_/IfToSpaceshipRector.php index 109a2f854c0..765edb2b40e 100644 --- a/rules/Php70/Rector/If_/IfToSpaceshipRector.php +++ b/rules/Php70/Rector/If_/IfToSpaceshipRector.php @@ -21,7 +21,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -123,7 +123,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SPACESHIP; + return PhpVersion::PHP_70; } private function refactorIf(If_ $if): ?Return_ diff --git a/rules/Php70/Rector/List_/EmptyListRector.php b/rules/Php70/Rector/List_/EmptyListRector.php index ae8453a9b5c..afac75bd6ea 100644 --- a/rules/Php70/Rector/List_/EmptyListRector.php +++ b/rules/Php70/Rector/List_/EmptyListRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -37,7 +37,7 @@ public function getRuleDefinition(): RuleDefinition public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_EMPTY_LIST; + return PhpVersion::PHP_70; } /** diff --git a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php index 27142783a1b..7b253065c42 100644 --- a/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php +++ b/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php @@ -20,7 +20,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -38,7 +38,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STATIC_CALL_ON_NON_STATIC; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php index dd7112dc28d..7562f03a319 100644 --- a/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php +++ b/rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -21,7 +21,7 @@ final class StaticCallOnNonStaticToInstanceCallRector extends AbstractRector imp { public function provideMinPhpVersion(): int { - return PhpVersionFeature::INSTANCE_CALL; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/StmtsAwareInterface/IfIssetToCoalescingRector.php b/rules/Php70/Rector/StmtsAwareInterface/IfIssetToCoalescingRector.php index e1d8166627f..a4fa0ca8b8a 100644 --- a/rules/Php70/Rector/StmtsAwareInterface/IfIssetToCoalescingRector.php +++ b/rules/Php70/Rector/StmtsAwareInterface/IfIssetToCoalescingRector.php @@ -19,7 +19,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -134,7 +134,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE; + return PhpVersion::PHP_70; } private function matchBareIfOnlyStmt(If_ $if): ?Stmt diff --git a/rules/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php b/rules/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php index 373cc6b66cc..5eb588ffe6d 100644 --- a/rules/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php +++ b/rules/Php70/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -20,7 +20,7 @@ final class ReduceMultipleDefaultSwitchRector extends AbstractRector implements { public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_MULTIPLE_DEFAULT_SWITCH; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php b/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php index bc3a9834ab4..fa18d225b54 100644 --- a/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php +++ b/rules/Php70/Rector/Ternary/TernaryToNullCoalescingRector.php @@ -21,7 +21,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\Application\File; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -109,7 +109,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE; + return PhpVersion::PHP_70; } private function processTernaryWithIsNull(Ternary $ternary, FuncCall $isNullFuncCall, bool $isNegated): ?Coalesce diff --git a/rules/Php70/Rector/Ternary/TernaryToSpaceshipRector.php b/rules/Php70/Rector/Ternary/TernaryToSpaceshipRector.php index 10c9285221b..934779abbbd 100644 --- a/rules/Php70/Rector/Ternary/TernaryToSpaceshipRector.php +++ b/rules/Php70/Rector/Ternary/TernaryToSpaceshipRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -79,7 +79,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SPACESHIP; + return PhpVersion::PHP_70; } private function shouldSkip(Ternary $ternary): bool diff --git a/rules/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php b/rules/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php index 2e7ac41c183..80b0a1e4704 100644 --- a/rules/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php +++ b/rules/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -20,7 +20,7 @@ final class WrapVariableVariableNameInCurlyBracesRector extends AbstractRector i { public function provideMinPhpVersion(): int { - return PhpVersionFeature::WRAP_VARIABLE_VARIABLE; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/Assign/AssignArrayToStringRector.php b/rules/Php71/Rector/Assign/AssignArrayToStringRector.php index 30c7c01d4fd..be1e467d4c7 100644 --- a/rules/Php71/Rector/Assign/AssignArrayToStringRector.php +++ b/rules/Php71/Rector/Assign/AssignArrayToStringRector.php @@ -24,7 +24,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -39,7 +39,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_ASSIGN_ARRAY_TO_STRING; + return PhpVersion::PHP_71; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php b/rules/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php index 78a35f2648d..877ae8a45a4 100644 --- a/rules/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php +++ b/rules/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php @@ -20,7 +20,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -35,7 +35,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::BINARY_OP_NUMBER_STRING; + return PhpVersion::PHP_71; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/BooleanOr/IsIterableRector.php b/rules/Php71/Rector/BooleanOr/IsIterableRector.php index 1ab116169c6..3bb8d5df312 100644 --- a/rules/Php71/Rector/BooleanOr/IsIterableRector.php +++ b/rules/Php71/Rector/BooleanOr/IsIterableRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -30,7 +30,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::IS_ITERABLE; + return PhpVersion::PHP_71; } public function getRuleDefinition(): RuleDefinition @@ -63,7 +63,7 @@ public function refactor(Node $node): ?Node private function shouldSkip(): bool { - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::IS_ITERABLE)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_71)) { return false; } diff --git a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php index 27e682a4082..f20dee4655e 100644 --- a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php +++ b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php @@ -20,7 +20,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -36,7 +36,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_EXTRA_PARAMETERS; + return PhpVersion::PHP_71; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php71/Rector/List_/ListToArrayDestructRector.php b/rules/Php71/Rector/List_/ListToArrayDestructRector.php index 4508ecbf87c..fccd6947217 100644 --- a/rules/Php71/Rector/List_/ListToArrayDestructRector.php +++ b/rules/Php71/Rector/List_/ListToArrayDestructRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -110,7 +110,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_DESTRUCT; + return PhpVersion::PHP_71; } private function hasPartialDestruct(List_ $list): bool diff --git a/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php b/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php index b5c8831bfdf..0399f2aa90e 100644 --- a/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php +++ b/rules/Php71/Rector/TryCatch/MultiExceptionCatchRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -102,6 +102,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::MULTI_EXCEPTION_CATCH; + return PhpVersion::PHP_71; } } diff --git a/rules/Php72/Rector/Assign/ListEachRector.php b/rules/Php72/Rector/Assign/ListEachRector.php index bf685fa668e..72381e887ea 100644 --- a/rules/Php72/Rector/Assign/ListEachRector.php +++ b/rules/Php72/Rector/Assign/ListEachRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -30,7 +30,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_EACH; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php b/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php index 658e489044a..7d471e818ff 100644 --- a/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php +++ b/rules/Php72/Rector/Assign/ReplaceEachAssignmentWithKeyCurrentRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -29,7 +29,7 @@ final class ReplaceEachAssignmentWithKeyCurrentRector extends AbstractRector imp public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_EACH_OUTSIDE_LOOP; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php b/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php index 8ab01dcc09f..c9c8f3129b8 100644 --- a/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php +++ b/rules/Php72/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php @@ -24,7 +24,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -41,7 +41,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_CREATE_FUNCTION; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php b/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php index 933c1611f28..609a936308f 100644 --- a/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php +++ b/rules/Php72/Rector/FuncCall/GetClassOnNullRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -25,7 +25,7 @@ final class GetClassOnNullRector extends AbstractRector implements MinPhpVersion { public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_NULL_ON_GET_CLASS; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector.php b/rules/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector.php index 417ec221c94..4746b3e7500 100644 --- a/rules/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector.php +++ b/rules/Php72/Rector/FuncCall/ParseStrWithResultArgumentRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -24,7 +24,7 @@ final class ParseStrWithResultArgumentRector extends AbstractRector implements M { public function provideMinPhpVersion(): int { - return PhpVersionFeature::RESULT_ARG_IN_PARSE_STR; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/StringifyDefineRector.php b/rules/Php72/Rector/FuncCall/StringifyDefineRector.php index 8a90f4ee623..0d3d9a27d14 100644 --- a/rules/Php72/Rector/FuncCall/StringifyDefineRector.php +++ b/rules/Php72/Rector/FuncCall/StringifyDefineRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -27,7 +27,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STRING_IN_FIRST_DEFINE_ARG; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php b/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php index 9aebedad0d5..7dd37df3e6f 100644 --- a/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php +++ b/rules/Php72/Rector/FuncCall/StringsAssertNakedRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -28,7 +28,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STRING_IN_ASSERT_ARG; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/Unset_/UnsetCastRector.php b/rules/Php72/Rector/Unset_/UnsetCastRector.php index 474023ee381..f5c07847564 100644 --- a/rules/Php72/Rector/Unset_/UnsetCastRector.php +++ b/rules/Php72/Rector/Unset_/UnsetCastRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -23,7 +23,7 @@ final class UnsetCastRector extends AbstractRector implements MinPhpVersionInter { public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_UNSET_CAST; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php72/Rector/While_/WhileEachToForeachRector.php b/rules/Php72/Rector/While_/WhileEachToForeachRector.php index 0f10a01ff44..911d884ab6f 100644 --- a/rules/Php72/Rector/While_/WhileEachToForeachRector.php +++ b/rules/Php72/Rector/While_/WhileEachToForeachRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -29,7 +29,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_EACH; + return PhpVersion::PHP_72; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/BooleanOr/IsCountableRector.php b/rules/Php73/Rector/BooleanOr/IsCountableRector.php index fcac29aa1fc..e0683810499 100644 --- a/rules/Php73/Rector/BooleanOr/IsCountableRector.php +++ b/rules/Php73/Rector/BooleanOr/IsCountableRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -68,7 +68,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::IS_COUNTABLE; + return PhpVersion::PHP_73; } public function providePolyfillPackage(): string diff --git a/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php b/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php index 371bb8e79ca..426c337b400 100644 --- a/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php +++ b/rules/Php73/Rector/ConstFetch/SensitiveConstantNameRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -90,7 +90,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_INSENSITIVE_CONSTANT_NAME; + return PhpVersion::PHP_73; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php b/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php index 05c46da1137..4b0cb568387 100644 --- a/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php +++ b/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -95,7 +95,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_KEY_FIRST_LAST; + return PhpVersion::PHP_73; } public function providePolyfillPackage(): string diff --git a/rules/Php73/Rector/FuncCall/ArrayKeysToArrayKeyFirstLastRector.php b/rules/Php73/Rector/FuncCall/ArrayKeysToArrayKeyFirstLastRector.php index 29ba58a0286..df12d487964 100644 --- a/rules/Php73/Rector/FuncCall/ArrayKeysToArrayKeyFirstLastRector.php +++ b/rules/Php73/Rector/FuncCall/ArrayKeysToArrayKeyFirstLastRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -117,7 +117,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_KEY_FIRST_LAST; + return PhpVersion::PHP_73; } public function providePolyfillPackage(): string diff --git a/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php b/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php index 0b76aec8e5e..8cc4656e027 100644 --- a/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php +++ b/rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -57,6 +57,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::JSON_EXCEPTION; + return PhpVersion::PHP_73; } } diff --git a/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php b/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php index fa49c7fffe2..bc0e0d64c5b 100644 --- a/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php +++ b/rules/Php73/Rector/FuncCall/RegexDashEscapeRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\Util\StringUtils; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -39,7 +39,7 @@ final class RegexDashEscapeRector extends AbstractRector implements MinPhpVersio public function provideMinPhpVersion(): int { - return PhpVersionFeature::ESCAPE_DASH_IN_REGEX; + return PhpVersion::PHP_73; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/SensitiveDefineRector.php b/rules/Php73/Rector/FuncCall/SensitiveDefineRector.php index b7964695679..117769e7b15 100644 --- a/rules/Php73/Rector/FuncCall/SensitiveDefineRector.php +++ b/rules/Php73/Rector/FuncCall/SensitiveDefineRector.php @@ -9,7 +9,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -19,7 +19,7 @@ final class SensitiveDefineRector extends AbstractRector implements MinPhpVersio { public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_INSENSITIVE_CONSTANT_DEFINE; + return PhpVersion::PHP_73; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/FuncCall/SetCookieRector.php b/rules/Php73/Rector/FuncCall/SetCookieRector.php index e33d627f932..f4ae80b4ba3 100644 --- a/rules/Php73/Rector/FuncCall/SetCookieRector.php +++ b/rules/Php73/Rector/FuncCall/SetCookieRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -86,7 +86,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SETCOOKIE_ACCEPT_ARRAY_OPTIONS; + return PhpVersion::PHP_73; } private function shouldSkip(FuncCall $funcCall): bool diff --git a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php index 677cd6a6ce6..0d14c5119fc 100644 --- a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php +++ b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -38,7 +38,7 @@ final class StringifyStrNeedlesRector extends AbstractRector implements MinPhpVe public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_INT_IN_STR_NEEDLES; + return PhpVersion::PHP_73; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php73/Rector/String_/SensitiveHereNowDocRector.php b/rules/Php73/Rector/String_/SensitiveHereNowDocRector.php index 1f9623b83f8..9615ed72043 100644 --- a/rules/Php73/Rector/String_/SensitiveHereNowDocRector.php +++ b/rules/Php73/Rector/String_/SensitiveHereNowDocRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -22,7 +22,7 @@ final class SensitiveHereNowDocRector extends AbstractRector implements MinPhpVe public function provideMinPhpVersion(): int { - return PhpVersionFeature::SENSITIVE_HERE_NOW_DOC; + return PhpVersion::PHP_73; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector.php b/rules/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector.php index a035640813a..7b3a96c7c58 100644 --- a/rules/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector.php +++ b/rules/Php74/Rector/ArrayDimFetch/CurlyToSquareBracketArrayStringRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\Application\File; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -21,7 +21,7 @@ final class CurlyToSquareBracketArrayStringRector extends AbstractRector impleme { public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_CURLY_BRACKET_ARRAY_STRING; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/Assign/NullCoalescingOperatorRector.php b/rules/Php74/Rector/Assign/NullCoalescingOperatorRector.php index f1e51d73f65..2c489c54f47 100644 --- a/rules/Php74/Rector/Assign/NullCoalescingOperatorRector.php +++ b/rules/Php74/Rector/Assign/NullCoalescingOperatorRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -62,6 +62,6 @@ public function refactor(Node $node): ?AssignCoalesce public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE_ASSIGN; + return PhpVersion::PHP_74; } } diff --git a/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php b/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php index ffbc602a20b..068f5ee0d77 100644 --- a/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php +++ b/rules/Php74/Rector/Closure/ClosureToArrowFunctionRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -114,6 +114,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARROW_FUNCTION; + return PhpVersion::PHP_74; } } diff --git a/rules/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php b/rules/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php index 887269c27b7..75e8294439e 100644 --- a/rules/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php +++ b/rules/Php74/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -22,7 +22,7 @@ final class ArrayKeyExistsOnPropertyRector extends AbstractRector implements Min { public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_KEY_EXISTS_TO_PROPERTY_EXISTS; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/FilterVarToAddSlashesRector.php b/rules/Php74/Rector/FuncCall/FilterVarToAddSlashesRector.php index d4e819bb631..fd83666ae98 100644 --- a/rules/Php74/Rector/FuncCall/FilterVarToAddSlashesRector.php +++ b/rules/Php74/Rector/FuncCall/FilterVarToAddSlashesRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -21,7 +21,7 @@ final class FilterVarToAddSlashesRector extends AbstractRector implements MinPhp { public function provideMinPhpVersion(): int { - return PhpVersionFeature::FILTER_VAR_TO_ADD_SLASHES; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/HebrevcToNl2brHebrevRector.php b/rules/Php74/Rector/FuncCall/HebrevcToNl2brHebrevRector.php index 8c4599a0dc5..3a56ff93671 100644 --- a/rules/Php74/Rector/FuncCall/HebrevcToNl2brHebrevRector.php +++ b/rules/Php74/Rector/FuncCall/HebrevcToNl2brHebrevRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -21,7 +21,7 @@ final class HebrevcToNl2brHebrevRector extends AbstractRector implements MinPhpV { public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_HEBREVC; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php b/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php index 929c3f6d567..1183841edc3 100644 --- a/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php +++ b/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -21,7 +21,7 @@ final class MbStrrposEncodingArgumentPositionRector extends AbstractRector imple { public function provideMinPhpVersion(): int { - return PhpVersionFeature::CHANGE_MB_STRPOS_ARG_POSITION; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/MoneyFormatToNumberFormatRector.php b/rules/Php74/Rector/FuncCall/MoneyFormatToNumberFormatRector.php index beeb792edb0..982192eb9f3 100644 --- a/rules/Php74/Rector/FuncCall/MoneyFormatToNumberFormatRector.php +++ b/rules/Php74/Rector/FuncCall/MoneyFormatToNumberFormatRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -33,7 +33,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_MONEY_FORMAT; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/FuncCall/RestoreIncludePathToIniRestoreRector.php b/rules/Php74/Rector/FuncCall/RestoreIncludePathToIniRestoreRector.php index 225c485c374..5f857a70158 100644 --- a/rules/Php74/Rector/FuncCall/RestoreIncludePathToIniRestoreRector.php +++ b/rules/Php74/Rector/FuncCall/RestoreIncludePathToIniRestoreRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -23,7 +23,7 @@ final class RestoreIncludePathToIniRestoreRector extends AbstractRector implemen { public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_RESTORE_INCLUDE_PATH; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/If_/IfToNullCoalescingAssignRector.php b/rules/Php74/Rector/If_/IfToNullCoalescingAssignRector.php index 2601293bd8b..f44dbbc560c 100644 --- a/rules/Php74/Rector/If_/IfToNullCoalescingAssignRector.php +++ b/rules/Php74/Rector/If_/IfToNullCoalescingAssignRector.php @@ -27,7 +27,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -127,7 +127,7 @@ public function refactor(Node $node): ?Expression public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULL_COALESCE_ASSIGN; + return PhpVersion::PHP_74; } private function isNonNullableProperty(Expr $expr): bool diff --git a/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php b/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php index d439f2ffde5..b9ea47c119f 100644 --- a/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php +++ b/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php @@ -13,7 +13,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -94,7 +94,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function shouldSkipProperty(Property $property, Class_ $class): bool diff --git a/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php b/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php index a28e68bf40a..4fc39d6beba 100644 --- a/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php +++ b/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -32,7 +32,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::EXPORT_TO_REFLECTION_FUNCTION; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php b/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php index 733a5554045..51001072286 100644 --- a/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php +++ b/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -27,7 +27,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_NESTED_TERNARY; + return PhpVersion::PHP_74; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php b/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php index 4fc3ce6f28a..83055bd9dc0 100644 --- a/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php +++ b/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -121,6 +121,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NON_CAPTURING_CATCH; + return PhpVersion::PHP_80; } } diff --git a/rules/Php80/Rector/ClassConstFetch/ClassOnThisVariableObjectRector.php b/rules/Php80/Rector/ClassConstFetch/ClassOnThisVariableObjectRector.php index cee02924d96..797848401b1 100644 --- a/rules/Php80/Rector/ClassConstFetch/ClassOnThisVariableObjectRector.php +++ b/rules/Php80/Rector/ClassConstFetch/ClassOnThisVariableObjectRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -93,7 +93,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASS_ON_OBJECT; + return PhpVersion::PHP_80; } private function shouldSkip(ClassConstFetch $classConstFetch): bool diff --git a/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php b/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php index 3b2002e7e00..f152febecd1 100644 --- a/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php +++ b/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php @@ -32,7 +32,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -51,7 +51,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::FATAL_ERROR_ON_INCOMPATIBLE_METHOD_SIGNATURE; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php b/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php index a338fb4d66b..5f85b4b10a1 100644 --- a/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php +++ b/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -26,7 +26,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::NO_FINAL_PRIVATE; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php b/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php index c51fbb17f36..4b7e81ee2f4 100644 --- a/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php +++ b/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -26,7 +26,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STATIC_VISIBILITY_SET_STATE; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php b/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php index e5e7c0fb3d8..f2c9cac1bb1 100644 --- a/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php +++ b/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php @@ -42,7 +42,7 @@ use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\Util\StringUtils; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Webmozart\Assert\Assert; @@ -193,7 +193,7 @@ public function configure(array $configuration): void public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } /** diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php index 6337b78cc65..0a659367b74 100644 --- a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php +++ b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php @@ -45,7 +45,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -298,7 +298,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::PROPERTY_PROMOTION; + return PhpVersion::PHP_80; } private function processUnionType(Property $property, Param $param): void diff --git a/rules/Php80/Rector/Class_/StringableForToStringRector.php b/rules/Php80/Rector/Class_/StringableForToStringRector.php index 8f4978411f5..5be53604090 100644 --- a/rules/Php80/Rector/Class_/StringableForToStringRector.php +++ b/rules/Php80/Rector/Class_/StringableForToStringRector.php @@ -24,7 +24,7 @@ use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -46,7 +46,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STRINGABLE; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php b/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php index 0762ae330fb..6f2677a6865 100644 --- a/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php +++ b/rules/Php80/Rector/FuncCall/ClassOnObjectRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -81,6 +81,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLASS_ON_OBJECT; + return PhpVersion::PHP_80; } } diff --git a/rules/Php80/Rector/Identical/StrEndsWithRector.php b/rules/Php80/Rector/Identical/StrEndsWithRector.php index fd5f850b847..9ef68a54e5a 100644 --- a/rules/Php80/Rector/Identical/StrEndsWithRector.php +++ b/rules/Php80/Rector/Identical/StrEndsWithRector.php @@ -23,7 +23,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\FuncCallAndExpr; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -41,7 +41,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STR_ENDS_WITH; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Identical/StrStartsWithRector.php b/rules/Php80/Rector/Identical/StrStartsWithRector.php index cd1a411c7e9..ce125ea8545 100644 --- a/rules/Php80/Rector/Identical/StrStartsWithRector.php +++ b/rules/Php80/Rector/Identical/StrStartsWithRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -46,7 +46,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STR_STARTS_WITH; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php b/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php index 453e6f6c2c5..9102aad0608 100644 --- a/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -40,7 +40,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STR_CONTAINS; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/NotIdentical/StrContainsRector.php b/rules/Php80/Rector/NotIdentical/StrContainsRector.php index a180fc4e6a5..d3c989e8dd9 100644 --- a/rules/Php80/Rector/NotIdentical/StrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/StrContainsRector.php @@ -19,7 +19,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -42,7 +42,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::STR_CONTAINS; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php index 9d86caac124..12741b45a11 100644 --- a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php +++ b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php @@ -27,7 +27,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -174,7 +174,7 @@ public function refactor(Node $node): null|Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::MATCH_EXPRESSION; + return PhpVersion::PHP_80; } private function castMatchCond(Match_ $match): void diff --git a/rules/Php80/Rector/Ternary/GetDebugTypeRector.php b/rules/Php80/Rector/Ternary/GetDebugTypeRector.php index 6f77faf380f..6895186fdc0 100644 --- a/rules/Php80/Rector/Ternary/GetDebugTypeRector.php +++ b/rules/Php80/Rector/Ternary/GetDebugTypeRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -25,7 +25,7 @@ final class GetDebugTypeRector extends AbstractRector implements MinPhpVersionIn { public function provideMinPhpVersion(): int { - return PhpVersionFeature::GET_DEBUG_TYPE; + return PhpVersion::PHP_80; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php80/Rector/Ternary/TernaryToNullsafeCoalesceRector.php b/rules/Php80/Rector/Ternary/TernaryToNullsafeCoalesceRector.php index d39a3c0616b..19076d2d302 100644 --- a/rules/Php80/Rector/Ternary/TernaryToNullsafeCoalesceRector.php +++ b/rules/Php80/Rector/Ternary/TernaryToNullsafeCoalesceRector.php @@ -20,7 +20,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -110,7 +110,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLSAFE_OPERATOR; + return PhpVersion::PHP_80; } /** diff --git a/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php b/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php index 851e58ad43e..e46bbdabc82 100644 --- a/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php +++ b/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -72,6 +72,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ENUM; + return PhpVersion::PHP_81; } } diff --git a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php index e7aad5544ac..81fcb271934 100644 --- a/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php +++ b/rules/Php81/Rector/Class_/SpatieEnumClassToEnumRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -32,7 +32,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::ENUM; + return PhpVersion::PHP_81; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php81/Rector/FuncCall/NullToStrictIntPregSlitFuncCallLimitArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictIntPregSlitFuncCallLimitArgRector.php index 9167ffa1a3c..86d9c6889b8 100644 --- a/rules/Php81/Rector/FuncCall/NullToStrictIntPregSlitFuncCallLimitArgRector.php +++ b/rules/Php81/Rector/FuncCall/NullToStrictIntPregSlitFuncCallLimitArgRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -91,7 +91,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_NULL_ARG_IN_STRING_FUNCTION; + return PhpVersion::PHP_81; } private function shouldSkip(FuncCall $funcCall): bool diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php index 49889aae547..7ad8fdaba99 100644 --- a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php +++ b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php @@ -18,7 +18,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -115,7 +115,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_NULL_ARG_IN_STRING_FUNCTION; + return PhpVersion::PHP_81; } /** diff --git a/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php b/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php index 59cc790c4b0..f5089c0729b 100644 --- a/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php +++ b/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php @@ -18,7 +18,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -100,7 +100,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ENUM; + return PhpVersion::PHP_81; } private function isEnumConstant(string $className, string $constant): bool diff --git a/rules/Php81/Rector/MethodCall/SpatieEnumMethodCallToEnumConstRector.php b/rules/Php81/Rector/MethodCall/SpatieEnumMethodCallToEnumConstRector.php index 8ab21088997..0dedb88d8ce 100644 --- a/rules/Php81/Rector/MethodCall/SpatieEnumMethodCallToEnumConstRector.php +++ b/rules/Php81/Rector/MethodCall/SpatieEnumMethodCallToEnumConstRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -95,7 +95,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ENUM; + return PhpVersion::PHP_81; } private function refactorGetterToMethodCall(MethodCall $methodCall, string $property): ?PropertyFetch diff --git a/rules/Php81/Rector/New_/MyCLabsConstructorCallToEnumFromRector.php b/rules/Php81/Rector/New_/MyCLabsConstructorCallToEnumFromRector.php index d00b7d6b70a..56820388a3c 100644 --- a/rules/Php81/Rector/New_/MyCLabsConstructorCallToEnumFromRector.php +++ b/rules/Php81/Rector/New_/MyCLabsConstructorCallToEnumFromRector.php @@ -16,7 +16,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -51,7 +51,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ENUM; + return PhpVersion::PHP_81; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php b/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php index 0747232fce0..8110f53b73a 100644 --- a/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php +++ b/rules/Php81/Rector/Property/ReadOnlyPropertyRector.php @@ -32,7 +32,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\Visibility; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -138,7 +138,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_PROPERTY; + return PhpVersion::PHP_81; } private function refactorProperty(Class_ $class, Property $property, Scope $scope): ?Property diff --git a/rules/Php82/Rector/Class_/ReadOnlyClassRector.php b/rules/Php82/Rector/Class_/ReadOnlyClassRector.php index cf04091624b..409639837a5 100644 --- a/rules/Php82/Rector/Class_/ReadOnlyClassRector.php +++ b/rules/Php82/Rector/Class_/ReadOnlyClassRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -73,6 +73,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_CLASS; + return PhpVersion::PHP_82; } } diff --git a/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php b/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php index 1669c43797f..3773eb5ce4e 100644 --- a/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php +++ b/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -88,6 +88,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_VARIABLE_IN_STRING_INTERPOLATION; + return PhpVersion::PHP_82; } } diff --git a/rules/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector.php b/rules/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector.php index f0b6c109adb..f9a742344d2 100644 --- a/rules/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector.php +++ b/rules/Php82/Rector/FuncCall/Utf8DecodeEncodeToMbConvertEncodingRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -76,6 +76,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_UTF8_DECODE_ENCODE_FUNCTION; + return PhpVersion::PHP_82; } } diff --git a/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php b/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php index 0346eaa4260..ab1701f4b18 100644 --- a/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php +++ b/rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php @@ -16,7 +16,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -79,7 +79,7 @@ public function refactor(Node $node): ?New_ public function provideMinPhpVersion(): int { - return PhpVersionFeature::FILESYSTEM_ITERATOR_SKIP_DOTS; + return PhpVersion::PHP_82; } /** diff --git a/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php b/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php index 86facd84373..c6692b71252 100644 --- a/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php +++ b/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -80,6 +80,6 @@ public function run(#[\SensitiveParameter] string $password) public function provideMinPhpVersion(): int { - return PhpVersionFeature::SENSITIVE_PARAMETER_ATTRIBUTE; + return PhpVersion::PHP_82; } } diff --git a/rules/Php83/Rector/BooleanAnd/JsonValidateRector.php b/rules/Php83/Rector/BooleanAnd/JsonValidateRector.php index bfc0202d3c5..37a77dc68be 100644 --- a/rules/Php83/Rector/BooleanAnd/JsonValidateRector.php +++ b/rules/Php83/Rector/BooleanAnd/JsonValidateRector.php @@ -19,7 +19,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -39,7 +39,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::JSON_VALIDATE; + return PhpVersion::PHP_83; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php83/Rector/ClassConst/AddTypeToConstRector.php b/rules/Php83/Rector/ClassConst/AddTypeToConstRector.php index 33997e9926f..afc475324bf 100644 --- a/rules/Php83/Rector/ClassConst/AddTypeToConstRector.php +++ b/rules/Php83/Rector/ClassConst/AddTypeToConstRector.php @@ -30,7 +30,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -153,7 +153,7 @@ public function refactor(Node $node): ?Class_ public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_CLASS_CONSTANTS; + return PhpVersion::PHP_83; } /** diff --git a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php index f5b469de949..7676cf9b54e 100644 --- a/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php +++ b/rules/Php83/Rector/ClassMethod/AddOverrideAttributeToOverriddenMethodsRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -87,6 +87,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::OVERRIDE_ATTRIBUTE; + return PhpVersion::PHP_83; } } diff --git a/rules/Php83/Rector/Class_/ReadOnlyAnonymousClassRector.php b/rules/Php83/Rector/Class_/ReadOnlyAnonymousClassRector.php index c12646158be..087011aa74c 100644 --- a/rules/Php83/Rector/Class_/ReadOnlyAnonymousClassRector.php +++ b/rules/Php83/Rector/Class_/ReadOnlyAnonymousClassRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -78,6 +78,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_ANONYMOUS_CLASS; + return PhpVersion::PHP_83; } } diff --git a/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php b/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php index a2a29af65df..4d7105f46e6 100644 --- a/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php +++ b/rules/Php83/Rector/FuncCall/CombineHostPortLdapUriRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -97,6 +97,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_HOST_PORT_SEPARATE_ARGS; + return PhpVersion::PHP_83; } } diff --git a/rules/Php83/Rector/FuncCall/DynamicClassConstFetchRector.php b/rules/Php83/Rector/FuncCall/DynamicClassConstFetchRector.php index 5d15baa9225..0edae049c41 100644 --- a/rules/Php83/Rector/FuncCall/DynamicClassConstFetchRector.php +++ b/rules/Php83/Rector/FuncCall/DynamicClassConstFetchRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -90,6 +90,6 @@ public function refactor(Node $node): ?ClassConstFetch public function provideMinPhpVersion(): int { - return PhpVersionFeature::DYNAMIC_CLASS_CONST_FETCH; + return PhpVersion::PHP_83; } } diff --git a/rules/Php83/Rector/FuncCall/RemoveGetClassGetParentClassNoArgsRector.php b/rules/Php83/Rector/FuncCall/RemoveGetClassGetParentClassNoArgsRector.php index ec1b3b8e643..50862a4ba60 100644 --- a/rules/Php83/Rector/FuncCall/RemoveGetClassGetParentClassNoArgsRector.php +++ b/rules/Php83/Rector/FuncCall/RemoveGetClassGetParentClassNoArgsRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -85,6 +85,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_GET_CLASS_WITHOUT_ARGS; + return PhpVersion::PHP_83; } } diff --git a/rules/Php84/Rector/Class_/DeprecatedAnnotationToDeprecatedAttributeRector.php b/rules/Php84/Rector/Class_/DeprecatedAnnotationToDeprecatedAttributeRector.php index 6549bcf1077..44b84f6ae42 100644 --- a/rules/Php84/Rector/Class_/DeprecatedAnnotationToDeprecatedAttributeRector.php +++ b/rules/Php84/Rector/Class_/DeprecatedAnnotationToDeprecatedAttributeRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -62,6 +62,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATED_ATTRIBUTE; + return PhpVersion::PHP_84; } } diff --git a/rules/Php84/Rector/Class_/PropertyHookRector.php b/rules/Php84/Rector/Class_/PropertyHookRector.php index 2405d84e93b..1a8b53488b6 100644 --- a/rules/Php84/Rector/Class_/PropertyHookRector.php +++ b/rules/Php84/Rector/Class_/PropertyHookRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -73,6 +73,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::PROPERTY_HOOKS; + return PhpVersion::PHP_84; } } diff --git a/rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php b/rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php index c73b71bb725..6609cb80bae 100644 --- a/rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php +++ b/rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_ALL; + return PhpVersion::PHP_84; } public function providePolyfillPackage(): string diff --git a/rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php b/rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php index 9cac901276a..48e005f7390 100644 --- a/rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php +++ b/rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_ANY; + return PhpVersion::PHP_84; } public function providePolyfillPackage(): string diff --git a/rules/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector.php b/rules/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector.php index 0c86c28adb1..305a1ecf4ac 100644 --- a/rules/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector.php +++ b/rules/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -71,7 +71,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_FIND_KEY; + return PhpVersion::PHP_84; } public function providePolyfillPackage(): string diff --git a/rules/Php84/Rector/Foreach_/ForeachToArrayFindRector.php b/rules/Php84/Rector/Foreach_/ForeachToArrayFindRector.php index 245770a4c71..4b8aa3457ce 100644 --- a/rules/Php84/Rector/Foreach_/ForeachToArrayFindRector.php +++ b/rules/Php84/Rector/Foreach_/ForeachToArrayFindRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\ValueObject\PolyfillPackage; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\VersionBonding\Contract\RelatedPolyfillInterface; @@ -67,7 +67,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_FIND; + return PhpVersion::PHP_84; } public function providePolyfillPackage(): string diff --git a/rules/Php84/Rector/FuncCall/AddEscapeArgumentRector.php b/rules/Php84/Rector/FuncCall/AddEscapeArgumentRector.php index 22de13f123d..cb89dd102aa 100644 --- a/rules/Php84/Rector/FuncCall/AddEscapeArgumentRector.php +++ b/rules/Php84/Rector/FuncCall/AddEscapeArgumentRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -103,7 +103,7 @@ public function refactor(Node $node): null|FuncCall|MethodCall public function provideMinPhpVersion(): int { - return PhpVersionFeature::REQUIRED_ESCAPE_PARAMETER; + return PhpVersion::PHP_84; } private function shouldSkipNamedArg(FuncCall|MethodCall $node): bool diff --git a/rules/Php84/Rector/FuncCall/RoundingModeEnumRector.php b/rules/Php84/Rector/FuncCall/RoundingModeEnumRector.php index a667f75984c..7fcf833c316 100644 --- a/rules/Php84/Rector/FuncCall/RoundingModeEnumRector.php +++ b/rules/Php84/Rector/FuncCall/RoundingModeEnumRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -94,6 +94,6 @@ public function refactor(Node $node): ?FuncCall public function provideMinPhpVersion(): int { - return PhpVersionFeature::ROUNDING_MODES; + return PhpVersion::PHP_84; } } diff --git a/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php b/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php index 471c5fe0617..c2f628dfcb2 100644 --- a/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php +++ b/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -92,6 +92,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NEW_METHOD_CALL_WITHOUT_PARENTHESES; + return PhpVersion::PHP_84; } } diff --git a/rules/Php84/Rector/Param/ExplicitNullableParamTypeRector.php b/rules/Php84/Rector/Param/ExplicitNullableParamTypeRector.php index 86404e1822c..500209f1b89 100644 --- a/rules/Php84/Rector/Param/ExplicitNullableParamTypeRector.php +++ b/rules/Php84/Rector/Param/ExplicitNullableParamTypeRector.php @@ -20,7 +20,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -102,6 +102,6 @@ public function refactor(Node $node): ?Param public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_IMPLICIT_NULLABLE_PARAM_TYPE; + return PhpVersion::PHP_84; } } diff --git a/rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php b/rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php index c546602fa53..c2127cd7bb4 100644 --- a/rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php +++ b/rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php @@ -14,7 +14,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -77,7 +77,7 @@ public function refactor(Node $node): ?FuncCall public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_FIRST_LAST; + return PhpVersion::PHP_85; } private function refactorArrayKeyPattern(ArrayDimFetch $arrayDimFetch): ?FuncCall diff --git a/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php b/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php index 9a40f4dd1d5..3058a5fb4e1 100644 --- a/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php +++ b/rules/Php85/Rector/ClassMethod/NullDebugInfoReturnRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -103,6 +103,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATED_NULL_DEBUG_INFO_RETURN; + return PhpVersion::PHP_85; } } diff --git a/rules/Php85/Rector/Class_/SleepToSerializeRector.php b/rules/Php85/Rector/Class_/SleepToSerializeRector.php index 653e5e0a5ad..40bbc8606e6 100644 --- a/rules/Php85/Rector/Class_/SleepToSerializeRector.php +++ b/rules/Php85/Rector/Class_/SleepToSerializeRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -37,7 +37,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATED_METHOD_SLEEP; + return PhpVersion::PHP_85; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php85/Rector/Class_/WakeupToUnserializeRector.php b/rules/Php85/Rector/Class_/WakeupToUnserializeRector.php index e83e0a04c86..5849d96023e 100644 --- a/rules/Php85/Rector/Class_/WakeupToUnserializeRector.php +++ b/rules/Php85/Rector/Class_/WakeupToUnserializeRector.php @@ -21,7 +21,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -34,7 +34,7 @@ final class WakeupToUnserializeRector extends AbstractRector implements MinPhpVe { public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATED_METHOD_WAKEUP; + return PhpVersion::PHP_85; } public function getRuleDefinition(): RuleDefinition diff --git a/rules/Php85/Rector/Expression/NestedFuncCallsToPipeOperatorRector.php b/rules/Php85/Rector/Expression/NestedFuncCallsToPipeOperatorRector.php index 3d8bf5670bb..d091f12b179 100644 --- a/rules/Php85/Rector/Expression/NestedFuncCallsToPipeOperatorRector.php +++ b/rules/Php85/Rector/Expression/NestedFuncCallsToPipeOperatorRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -84,6 +84,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::PIPE_OPERATOER; + return PhpVersion::PHP_85; } } diff --git a/rules/Php85/Rector/FuncCall/ArrayKeyExistsNullToEmptyStringRector.php b/rules/Php85/Rector/FuncCall/ArrayKeyExistsNullToEmptyStringRector.php index 2002019f74b..34e19d68cde 100644 --- a/rules/Php85/Rector/FuncCall/ArrayKeyExistsNullToEmptyStringRector.php +++ b/rules/Php85/Rector/FuncCall/ArrayKeyExistsNullToEmptyStringRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -80,6 +80,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_NULL_ARG_IN_ARRAY_KEY_EXISTS_FUNCTION; + return PhpVersion::PHP_85; } } diff --git a/rules/Php85/Rector/FuncCall/ChrArgModuloRector.php b/rules/Php85/Rector/FuncCall/ChrArgModuloRector.php index 143e2ba7b20..7f714c81231 100644 --- a/rules/Php85/Rector/FuncCall/ChrArgModuloRector.php +++ b/rules/Php85/Rector/FuncCall/ChrArgModuloRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -92,6 +92,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_OUTSIDE_INTERVEL_VAL_IN_CHR_FUNCTION; + return PhpVersion::PHP_85; } } diff --git a/rules/Php85/Rector/FuncCall/OrdSingleByteRector.php b/rules/Php85/Rector/FuncCall/OrdSingleByteRector.php index 11e8c82ca16..1a29afe56f1 100644 --- a/rules/Php85/Rector/FuncCall/OrdSingleByteRector.php +++ b/rules/Php85/Rector/FuncCall/OrdSingleByteRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -101,7 +101,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_ORD_WITH_MULTIBYTE_STRING; + return PhpVersion::PHP_85; } /** diff --git a/rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php b/rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php index 2198533d6cf..4b06aed9588 100644 --- a/rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php +++ b/rules/Php85/Rector/FuncCall/RemoveFinfoBufferContextArgRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_FINFO_BUFFER_CONTEXT; + return PhpVersion::PHP_85; } private function removeContextArg(FuncCall|MethodCall $callLike): bool diff --git a/rules/Php85/Rector/Property/AddOverrideAttributeToOverriddenPropertiesRector.php b/rules/Php85/Rector/Property/AddOverrideAttributeToOverriddenPropertiesRector.php index e44c4926386..d6d1b2d909d 100644 --- a/rules/Php85/Rector/Property/AddOverrideAttributeToOverriddenPropertiesRector.php +++ b/rules/Php85/Rector/Property/AddOverrideAttributeToOverriddenPropertiesRector.php @@ -17,7 +17,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -83,7 +83,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::OVERRIDE_ATTRIBUTE_ON_PROPERTIES; + return PhpVersion::PHP_85; } /** diff --git a/rules/Php85/Rector/ShellExec/ShellExecFunctionCallOverBackticksRector.php b/rules/Php85/Rector/ShellExec/ShellExecFunctionCallOverBackticksRector.php index 6e12f316731..7ac07e2f58d 100644 --- a/rules/Php85/Rector/ShellExec/ShellExecFunctionCallOverBackticksRector.php +++ b/rules/Php85/Rector/ShellExec/ShellExecFunctionCallOverBackticksRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -80,6 +80,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::DEPRECATE_BACKTICKS; + return PhpVersion::PHP_85; } } diff --git a/rules/Php85/Rector/StmtsAwareInterface/SequentialAssignmentsToPipeOperatorRector.php b/rules/Php85/Rector/StmtsAwareInterface/SequentialAssignmentsToPipeOperatorRector.php index b5350afecf9..ebbb7bbde5f 100644 --- a/rules/Php85/Rector/StmtsAwareInterface/SequentialAssignmentsToPipeOperatorRector.php +++ b/rules/Php85/Rector/StmtsAwareInterface/SequentialAssignmentsToPipeOperatorRector.php @@ -11,7 +11,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -55,7 +55,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::PIPE_OPERATOER; + return PhpVersion::PHP_85; } /** diff --git a/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php b/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php index 2b4f5b1ca00..e7e7fff6241 100644 --- a/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php +++ b/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php @@ -10,7 +10,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -110,6 +110,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::COLON_AFTER_SWITCH_CASE; + return PhpVersion::PHP_85; } } diff --git a/rules/Php86/Rector/Class_/ConstructorReadonlyAssignToDefaultRector.php b/rules/Php86/Rector/Class_/ConstructorReadonlyAssignToDefaultRector.php index d7614370004..3bce54840d5 100644 --- a/rules/Php86/Rector/Class_/ConstructorReadonlyAssignToDefaultRector.php +++ b/rules/Php86/Rector/Class_/ConstructorReadonlyAssignToDefaultRector.php @@ -21,7 +21,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -120,7 +120,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::READONLY_PROPERTY_DEFAULT_VALUE; + return PhpVersion::PHP_86; } private function isDefaultableReadonlyProperty(Property $property): bool diff --git a/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php b/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php index a1b24ed131b..aef0937d0e8 100644 --- a/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php +++ b/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php @@ -12,7 +12,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -62,7 +62,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::CLAMP; + return PhpVersion::PHP_86; } private function matchClampFuncCall(FuncCall $outerFuncCall, string $expectedInnerFuncName): ?FuncCall diff --git a/rules/Renaming/Rector/Class_/RenameAttributeRector.php b/rules/Renaming/Rector/Class_/RenameAttributeRector.php index 772706c274d..435472bc2d1 100644 --- a/rules/Renaming/Rector/Class_/RenameAttributeRector.php +++ b/rules/Renaming/Rector/Class_/RenameAttributeRector.php @@ -16,7 +16,7 @@ use Rector\Renaming\ValueObject\RenameAttribute; use Rector\RuleDoc\CodeSample\ConfiguredCodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Webmozart\Assert\Assert; @@ -106,7 +106,7 @@ public function configure(array $configuration): void public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } private function matchNewAttributeName(Attribute $attribute): ?string diff --git a/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php b/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php index 3ca5b32bcf2..1e3726afb57 100644 --- a/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php +++ b/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php @@ -16,7 +16,7 @@ use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger; use Rector\Php\PhpVersionProvider; use Rector\PhpParser\Node\NodeFactory; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; final readonly class PropertyTypeDecorator { @@ -35,7 +35,7 @@ public function decoratePropertyUnionType( bool $changeVarTypeFallback = true ): void { if (! TypeCombinator::containsNull($unionType)) { - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { $property->type = $typeNode; return; } diff --git a/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php b/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php index 202647bab69..f49e0fc671c 100644 --- a/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php +++ b/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php @@ -14,7 +14,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -86,6 +86,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARROW_FUNCTION; + return PhpVersion::PHP_74; } } diff --git a/rules/TypeDeclaration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector.php index 300166209d7..9b521a33f8e 100644 --- a/rules/TypeDeclaration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector.php @@ -15,7 +15,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnVendorLockResolver; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -112,7 +112,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::VOID_TYPE; + return PhpVersion::PHP_71; } private function shouldSkipClassMethod( diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php index c4b491a2ecb..7f63a7947b0 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php @@ -21,7 +21,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Webmozart\Assert\Assert; @@ -182,7 +182,7 @@ private function refactorParameter(Param $param, AddParamTypeDeclaration $addPar // remove it if ($addParamTypeDeclaration->getParamType() instanceof MixedType) { - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::MIXED_TYPE)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { $param->type = $paramTypeNode; return; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php index 264ba115c91..f9d5fe51679 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeFromPropertyTypeRector.php @@ -20,7 +20,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\Guard\ParamTypeAddGuard; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -127,7 +127,7 @@ public function refactor(Node $node): ?ClassMethod public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php index 3382f176abd..db8fd5b1ea1 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php @@ -19,7 +19,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -37,7 +37,7 @@ public function __construct( public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } public function getRuleDefinition(): RuleDefinition @@ -167,7 +167,7 @@ private function processClassMethodReturnType( } if ($parentType instanceof MixedType && ! $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::MIXED_TYPE + PhpVersion::PHP_80 )) { return null; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php index 3c2dd6d445a..9901d71328c 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationRector.php @@ -23,7 +23,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\StaticTypeMapper\ValueObject\Type\SimpleStaticType; use Rector\TypeDeclaration\ValueObject\AddReturnTypeDeclaration; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Webmozart\Assert\Assert; @@ -152,7 +152,7 @@ private function processClassMethodNodeWithTypehints( // remove it if ($newType instanceof MixedType && ! $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::MIXED_TYPE + PhpVersion::PHP_80 )) { $classMethod->returnType = null; return; diff --git a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstAndStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstAndStrictReturnsRector.php index 92e8263cd34..06e4763759f 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstAndStrictReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstAndStrictReturnsRector.php @@ -21,7 +21,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -117,7 +117,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstReturnsRector.php index e72297212de..224d4f2ff80 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanConstReturnsRector.php @@ -19,7 +19,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -111,7 +111,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php index b1dbef0a810..09c44f7725b 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php @@ -25,7 +25,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -117,7 +117,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector.php index 379b82f92a6..1a02c14c21c 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/KnownMagicClassMethodTypeRector.php @@ -13,7 +13,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -110,14 +110,14 @@ public function refactor(Node $node): ?Node } if ($this->isName($classMethod, MethodName::__GET) && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::MIXED_TYPE + PhpVersion::PHP_80 ) && ! $classMethod->returnType instanceof Node) { $classMethod->returnType = new Identifier('mixed'); $hasChanged = true; } if ($this->isName($classMethod, MethodName::__SET) && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::MIXED_TYPE + PhpVersion::PHP_80 )) { $secondParam = $classMethod->getParams()[1]; if (! $secondParam->type instanceof Node) { @@ -136,6 +136,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php index af1e7568fee..ee79556a40c 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php @@ -20,7 +20,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -135,7 +135,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function shouldSkip(ClassMethod|Function_ $functionLike, Scope $scope): bool diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php index c46415a819e..4d8a4289216 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -133,7 +133,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function shouldSkip(ClassMethod|Function_ $functionLike, Scope $scope): bool diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php index 565cfa46a8a..37d32370da6 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php @@ -13,7 +13,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeManipulator\AddNeverReturnType; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -78,7 +78,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NEVER_TYPE; + return PhpVersion::PHP_81; } private function isTestClassMethodWithFilledReturnType(ClassMethod|Function_ $callLike): bool diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector.php index 54d42e92cdd..c2a734be845 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnNullableTypeRector.php @@ -16,7 +16,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -77,7 +77,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLABLE_TYPE; + return PhpVersion::PHP_71; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnCastRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnCastRector.php index ac52ba6f6c9..bd326a05d7b 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnCastRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnCastRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeManipulator\AddReturnTypeFromCast; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -81,6 +81,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnDirectArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnDirectArrayRector.php index b2acc31a8a1..228ba35c253 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnDirectArrayRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnDirectArrayRector.php @@ -15,7 +15,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -100,7 +100,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function hasReturnArray(ClassMethod|Function_ $functionLike): bool diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php index 138f38060aa..ec1cc2bb176 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php @@ -36,7 +36,7 @@ use Rector\Symfony\TypeAnalyzer\ControllerAnalyzer; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; use Rector\TypeDeclaration\NodeAnalyzer\ReturnTypeAnalyzer\StrictReturnNewAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -136,7 +136,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function createObjectTypeFromNew(New_ $new): ObjectType|ObjectWithoutClassType|StaticType|null diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictFluentReturnRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictFluentReturnRector.php index 9f034236977..8e847fd1954 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictFluentReturnRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictFluentReturnRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -72,7 +72,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::HAS_RETURN_TYPE; + return PhpVersion::PHP_70; } /** @@ -137,6 +137,6 @@ private function shouldSelf(ClassReflection $classReflection): bool return true; } - return ! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::STATIC_RETURN_TYPE); + return ! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80); } } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php index bc33cb853d9..1a3dc5775c9 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictParamRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeManipulator\AddReturnTypeFromParam; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -63,7 +63,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::NULLABLE_TYPE; + return PhpVersion::PHP_71; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php index 610c0e650ea..fa3babdecbe 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php @@ -30,7 +30,7 @@ use Rector\TypeDeclaration\NodeAnalyzer\TypeNodeUnwrapper; use Rector\TypeDeclaration\TypeAnalyzer\ReturnStrictTypeAnalyzer; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -98,7 +98,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** @@ -134,7 +134,7 @@ public function refactor(Node $node): ?Node return $this->refactorSingleReturnType($currentScopeReturns[0], $returnedStrictTypes[0], $node); } - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { /** @var PhpParserUnionType[] $returnedStrictTypes */ $unwrappedTypes = $this->typeNodeUnwrapper->unwrapNullableUnionTypes($returnedStrictTypes); $unionType = new PhpParserUnionType($unwrappedTypes); diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php index d9710243f44..396610308cf 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedPropertyRector.php @@ -22,7 +22,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -118,7 +118,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php index 091c601d464..cca3a6e169e 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromSymfonySerializerRector.php @@ -16,7 +16,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -73,7 +73,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::HAS_RETURN_TYPE; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector.php index d6c208abd4a..1976907bacd 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeManipulator\AddUnionReturnType; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -78,7 +78,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::UNION_TYPES; + return PhpVersion::PHP_80; } /** diff --git a/rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php b/rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php index ed819ed9863..c61f837349e 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/StrictStringParamConcatRector.php @@ -13,7 +13,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -58,7 +58,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/Class_/AddTestsVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/Class_/AddTestsVoidReturnTypeWhereNoReturnRector.php index fbecc66c8eb..c566ce23d1f 100644 --- a/rules/TypeDeclaration/Rector/Class_/AddTestsVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/Class_/AddTestsVoidReturnTypeWhereNoReturnRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -105,6 +105,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::VOID_TYPE; + return PhpVersion::PHP_71; } } diff --git a/rules/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector.php index 88e12dd1348..222bfa95f75 100644 --- a/rules/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/Class_/MergeDateTimePropertyTypeDeclarationRector.php @@ -15,7 +15,7 @@ use Rector\Rector\AbstractRector; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -119,6 +119,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } } diff --git a/rules/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector.php b/rules/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector.php index c799d0863d7..d6fcb596fc0 100644 --- a/rules/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector.php +++ b/rules/TypeDeclaration/Rector/Class_/ObjectTypedPropertyFromJMSSerializerAttributeTypeRector.php @@ -17,7 +17,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\JMSTypeAnalyzer; use Rector\TypeDeclaration\NodeFactory\JMSTypePropertyTypeFactory; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -70,7 +70,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } /** diff --git a/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php b/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php index b5e9c878ece..528fd54724d 100644 --- a/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php +++ b/rules/TypeDeclaration/Rector/Class_/PropertyTypeFromStrictSetterGetterRector.php @@ -34,7 +34,7 @@ use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\GetterTypeDeclarationPropertyTypeInferer; use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\SetterTypeDeclarationPropertyTypeInferer; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -170,7 +170,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function matchGetterSetterIdenticalType(Property $property, Class_ $class): ?Type diff --git a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromMockObjectRector.php b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromMockObjectRector.php index d9fe72f6990..48782b008a5 100644 --- a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromMockObjectRector.php +++ b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromMockObjectRector.php @@ -19,7 +19,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -130,7 +130,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function isIntersectionWithMockObjectType(Type $type): bool diff --git a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php index 1d52a3a8800..fbab645cd44 100644 --- a/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php +++ b/rules/TypeDeclaration/Rector/Class_/ReturnTypeFromStrictTernaryRector.php @@ -22,7 +22,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\NodeAnalyzer\ReturnAnalyzer; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -133,7 +133,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function shouldSkip(ClassMethod|Function_ $functionLike, Scope $scope): bool diff --git a/rules/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector.php b/rules/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector.php index f26f09c55c3..4f89752a58b 100644 --- a/rules/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector.php +++ b/rules/TypeDeclaration/Rector/Class_/ScalarTypedPropertyFromJMSSerializerAttributeTypeRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\JMSTypeAnalyzer; use Rector\TypeDeclaration\NodeFactory\JMSTypePropertyTypeFactory; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -72,7 +72,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } /** diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector.php index 7f511453f9b..e443223fd2b 100644 --- a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector.php +++ b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromContainerGetSetUpRector.php @@ -15,7 +15,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\SetUpAssignedPropertyTyper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -90,7 +90,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function isContainerGetCall(Expr $expr): bool diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php index 7bfd1a008f8..bbf223ff601 100644 --- a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php +++ b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php @@ -19,7 +19,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector; use Rector\TypeDeclaration\TypeInferer\AssignToPropertyTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -138,7 +138,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function isAlreadyTypedWithMockObject(Property $property, ObjectType $mockObjectType): bool diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector.php index a61e7b79ea2..26a509d0988 100644 --- a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector.php +++ b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromDocblockSetUpDefinedRector.php @@ -22,7 +22,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -164,7 +164,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function removeVarTag(PhpDocInfo $propertyPhpDocInfo, Property $property): void diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector.php index 7138148185a..153e8d4c194 100644 --- a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector.php +++ b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromGetRepositorySetUpRector.php @@ -12,7 +12,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\SetUpAssignedPropertyTyper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -87,7 +87,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function isGetRepositoryCall(Expr $expr): bool diff --git a/rules/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector.php b/rules/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector.php index 3a2e918b098..b771b765da8 100644 --- a/rules/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector.php +++ b/rules/TypeDeclaration/Rector/Closure/AddClosureNeverReturnTypeRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeManipulator\AddNeverReturnType; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -63,6 +63,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::NEVER_TYPE; + return PhpVersion::PHP_81; } } diff --git a/rules/TypeDeclaration/Rector/Closure/AddClosureVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/Closure/AddClosureVoidReturnTypeWhereNoReturnRector.php index deb78337aee..5b666392bab 100644 --- a/rules/TypeDeclaration/Rector/Closure/AddClosureVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/Closure/AddClosureVoidReturnTypeWhereNoReturnRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -70,6 +70,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::VOID_TYPE; + return PhpVersion::PHP_71; } } diff --git a/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector.php b/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector.php index f611bb80b6b..538997cfa9e 100644 --- a/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector.php +++ b/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeFromAssertInstanceOfRector.php @@ -20,7 +20,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -124,7 +124,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function hasAssertInstanceOf(Closure $closure): bool diff --git a/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeRector.php b/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeRector.php index c139dd5d4cb..1c059f69f40 100644 --- a/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeRector.php +++ b/rules/TypeDeclaration/Rector/Closure/ClosureReturnTypeRector.php @@ -13,7 +13,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -82,6 +82,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } } diff --git a/rules/TypeDeclaration/Rector/FuncCall/AddArrayAnyAllClosureParamTypeRector.php b/rules/TypeDeclaration/Rector/FuncCall/AddArrayAnyAllClosureParamTypeRector.php index 81391fa6b52..a28fe7428c7 100644 --- a/rules/TypeDeclaration/Rector/FuncCall/AddArrayAnyAllClosureParamTypeRector.php +++ b/rules/TypeDeclaration/Rector/FuncCall/AddArrayAnyAllClosureParamTypeRector.php @@ -10,7 +10,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ArrayCallbackParamTypeResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -66,6 +66,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_ANY; + return PhpVersion::PHP_84; } } diff --git a/rules/TypeDeclaration/Rector/FuncCall/AddArrayFunctionClosureParamTypeRector.php b/rules/TypeDeclaration/Rector/FuncCall/AddArrayFunctionClosureParamTypeRector.php index 48634279a5e..562e49440f1 100644 --- a/rules/TypeDeclaration/Rector/FuncCall/AddArrayFunctionClosureParamTypeRector.php +++ b/rules/TypeDeclaration/Rector/FuncCall/AddArrayFunctionClosureParamTypeRector.php @@ -21,7 +21,7 @@ use Rector\RuleDoc\RuleDefinition; use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\Enum\NativeFuncCallPositions; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -147,7 +147,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } private function resolveArrayItemType(Type $mainType): ?Type diff --git a/rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php b/rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php index e71b8facb79..cb7f26fcfc3 100644 --- a/rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php +++ b/rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php @@ -18,7 +18,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\Enum\NativeFuncCallPositions; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -130,7 +130,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } /** diff --git a/rules/TypeDeclaration/Rector/FuncCall/NarrowArrayAnyAllNullableParamTypeRector.php b/rules/TypeDeclaration/Rector/FuncCall/NarrowArrayAnyAllNullableParamTypeRector.php index f45b0b1094e..59064edee28 100644 --- a/rules/TypeDeclaration/Rector/FuncCall/NarrowArrayAnyAllNullableParamTypeRector.php +++ b/rules/TypeDeclaration/Rector/FuncCall/NarrowArrayAnyAllNullableParamTypeRector.php @@ -10,7 +10,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\NodeAnalyzer\ArrayCallbackParamTypeResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -66,6 +66,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ARRAY_ANY; + return PhpVersion::PHP_84; } } diff --git a/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php b/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php index 49272e79b0b..d55dabd71ac 100644 --- a/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php +++ b/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php @@ -15,7 +15,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclarationDocblocks\NodeFinder\YieldNodeFinder; use Rector\TypeDeclarationDocblocks\TypeResolver\YieldTypeResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard; use Rector\VersionBonding\Contract\MinPhpVersionInterface; @@ -108,6 +108,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::SCALAR_TYPES; + return PhpVersion::PHP_70; } } diff --git a/rules/TypeDeclaration/Rector/Function_/AddFunctionVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/Function_/AddFunctionVoidReturnTypeWhereNoReturnRector.php index 4d30b4e2255..fb7356fe56b 100644 --- a/rules/TypeDeclaration/Rector/Function_/AddFunctionVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/Function_/AddFunctionVoidReturnTypeWhereNoReturnRector.php @@ -11,7 +11,7 @@ use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -70,6 +70,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::VOID_TYPE; + return PhpVersion::PHP_71; } } diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php index d65a0ca44ef..3eb67560fd4 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php @@ -32,7 +32,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator; use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\AllAssignNodePropertyTypeInferer; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -119,7 +119,7 @@ public function getNodeTypes(): array public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } /** diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php index 0f49c67fb95..87850041099 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php @@ -25,7 +25,7 @@ use Rector\TypeDeclaration\TypeAnalyzer\PropertyTypeDefaultValueAnalyzer; use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\TrustedClassMethodPropertyTypeInferer; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -179,7 +179,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } private function shouldSkipPropertyType(Type $propertyType): bool diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php index d59a70f2a9f..a0ce5345be8 100644 --- a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php +++ b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php @@ -21,7 +21,7 @@ use Rector\StaticTypeMapper\StaticTypeMapper; use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\TrustedClassMethodPropertyTypeInferer; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; /** @@ -145,6 +145,6 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::TYPED_PROPERTIES; + return PhpVersion::PHP_74; } } diff --git a/src/NodeDecorator/PropertyTypeDecorator.php b/src/NodeDecorator/PropertyTypeDecorator.php index 9daa733df42..636d1a66ebc 100644 --- a/src/NodeDecorator/PropertyTypeDecorator.php +++ b/src/NodeDecorator/PropertyTypeDecorator.php @@ -13,7 +13,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; final readonly class PropertyTypeDecorator { @@ -33,7 +33,7 @@ public function decorate(Property $property, ?Type $type): void $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property); - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_74)) { $phpParserType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PROPERTY); if ($phpParserType instanceof Node) { diff --git a/src/NodeManipulator/ClassDependencyManipulator.php b/src/NodeManipulator/ClassDependencyManipulator.php index e51993b8f55..5c91f0f6b0f 100644 --- a/src/NodeManipulator/ClassDependencyManipulator.php +++ b/src/NodeManipulator/ClassDependencyManipulator.php @@ -30,7 +30,7 @@ use Rector\Reflection\ReflectionResolver; use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer; use Rector\ValueObject\MethodName; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @api used by rector-symfony and rector-doctrine @@ -63,7 +63,7 @@ public function addConstructorDependency(Class_ $class, PropertyMetadata $proper $autowireClassMethod = $this->autowiredClassMethodOrPropertyAnalyzer->matchAutowiredMethodInClass($class); if (! $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::PROPERTY_PROMOTION + PhpVersion::PHP_80 ) || $autowireClassMethod instanceof ClassMethod) { $this->classInsertManipulator->addPropertyToClass( $class, @@ -363,7 +363,7 @@ private function matchMethodParameter(ClassMethod $classMethod, string $name): ? private function shouldAddPromotedProperty(Class_ $class, PropertyMetadata $propertyMetadata): bool { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::PROPERTY_PROMOTION)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return false; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/AccessoryStringTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/AccessoryStringTypeMapper.php index 1bd48e24b0e..6fa39774cd5 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/AccessoryStringTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/AccessoryStringTypeMapper.php @@ -14,7 +14,7 @@ use PHPStan\Type\Type; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * Every accessory string type narrows "string" with an extra guarantee, so they all map back to "string" @@ -48,7 +48,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php index 20b4c359686..cf72c0c41b6 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php @@ -12,7 +12,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -45,7 +45,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } @@ -57,7 +57,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node return new Identifier('false'); } - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_82)) { return new Identifier('bool'); } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php index 9c74e5ed733..9dd3e76cf21 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php @@ -13,7 +13,7 @@ use PHPStan\Type\TypeTraverser; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -60,7 +60,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php index 6aa1dfb52bd..330c45905a5 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php @@ -16,7 +16,7 @@ use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -71,28 +71,28 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { // ref https://3v4l.org/iKMK6#v5.3.29 if ($typeKind === TypeKind::PARAM && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::ANONYMOUS_FUNCTION_PARAM_TYPE + PhpVersion::PHP_53 )) { return new FullyQualified('Closure'); } // ref https://3v4l.org/g8WvW#v7.4.0 if ($typeKind === TypeKind::PROPERTY && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::TYPED_PROPERTIES + PhpVersion::PHP_74 )) { return new FullyQualified('Closure'); } // ref https://3v4l.org/nUreN#v7.0.0 if ($typeKind === TypeKind::RETURN && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::ANONYMOUS_FUNCTION_RETURN_TYPE + PhpVersion::PHP_70 )) { return new FullyQualified('Closure'); } // ref https://3v4l.org/ruh5g#v8.0.0 if ($typeKind === TypeKind::UNION && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::UNION_TYPES + PhpVersion::PHP_80 )) { return new FullyQualified('Closure'); } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ConstantArrayTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ConstantArrayTypeMapper.php index d6628866064..4fb46d028a2 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/ConstantArrayTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/ConstantArrayTypeMapper.php @@ -11,7 +11,7 @@ use PHPStan\Type\Type; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -41,7 +41,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php index 237f62c0520..51f86b5a830 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php @@ -11,7 +11,7 @@ use PHPStan\Type\Type; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -44,7 +44,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php index 9fa9664c17e..dbccc5e30a9 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php @@ -11,7 +11,7 @@ use PHPStan\Type\Type; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -45,7 +45,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): IdentifierTypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php index 8efe6d28bd9..53492099831 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php @@ -22,7 +22,7 @@ use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; use Rector\StaticTypeMapper\Mapper\ScalarStringToTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -100,7 +100,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node return new Identifier('string'); } - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::INTERSECTION_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_81)) { return null; } @@ -132,7 +132,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node } if ($typeKind === TypeKind::UNION && ! $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::UNION_INTERSECTION_TYPES + PhpVersion::PHP_82 )) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php index 1c76ee66504..f87cdccab57 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/MixedTypeMapper.php @@ -12,7 +12,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -45,7 +45,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::MIXED_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php index 2f973b12b2b..41a8bf637ee 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/NullTypeMapper.php @@ -12,7 +12,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -48,14 +48,14 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { // can be a standalone type, only case where null makes sense if ($this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE + PhpVersion::PHP_82 ) && $typeKind === TypeKind::RETURN) { return new Identifier('null'); } // if part of union, can be added even in PHP 8.0 if ($typeKind === TypeKind::UNION && $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::NULLABLE_TYPE + PhpVersion::PHP_71 )) { return new Identifier('null'); } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php index 98abef13aaf..7b579cbb1fc 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php @@ -15,7 +15,7 @@ use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -57,7 +57,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node } } - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::OBJECT_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_72)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php index 270a5e06166..bcd234e5124 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/StaticTypeMapper.php @@ -14,7 +14,7 @@ use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; use Rector\StaticTypeMapper\ValueObject\Type\SelfStaticType; use Rector\StaticTypeMapper\ValueObject\Type\SimpleStaticType; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @see \Rector\Tests\NodeTypeResolver\StaticTypeMapper\StaticTypeMapperTest @@ -57,7 +57,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): Name return new Name(ObjectReference::SELF); } - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::STATIC_RETURN_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return new Name(ObjectReference::SELF); } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php index ff5341535db..90c58411d43 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/StrictMixedTypeMapper.php @@ -12,7 +12,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -47,7 +47,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::MIXED_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php index 5d2c11d4e4b..b4149f93d3d 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/StringTypeMapper.php @@ -11,7 +11,7 @@ use PHPStan\Type\Type; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -41,7 +41,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php index 264c09b6f5f..3a6f46a2930 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/TypeWithClassNameTypeMapper.php @@ -11,7 +11,7 @@ use PHPStan\Type\TypeWithClassName; use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -44,7 +44,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::SCALAR_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_70)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php index c80df7cafdc..4bbba510768 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php @@ -24,7 +24,7 @@ use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Webmozart\Assert\Assert; use Webmozart\Assert\InvalidArgumentException; @@ -145,7 +145,7 @@ private function resolveTypeWithNullablePHPParserUnionType( private function resolveNullableType(NullableType $nullableType): null|NullableType|PhpParserUnionType { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::NULLABLE_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_71)) { return null; } @@ -154,7 +154,7 @@ private function resolveNullableType(NullableType $nullableType): null|NullableT if (! $type instanceof PHPParserNodeIntersectionType) { // ?false is allowed only since PHP 8.2+, lets fallback to bool instead if ($type->toString() === 'false' && ! $this->phpVersionProvider->isAtLeastPhpVersion( - PhpVersionFeature::NULL_FALSE_TRUE_STANDALONE_TYPE + PhpVersion::PHP_82 )) { return new NullableType(new Identifier('bool')); } @@ -162,7 +162,7 @@ private function resolveNullableType(NullableType $nullableType): null|NullableT return $nullableType; } - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return null; } @@ -174,7 +174,7 @@ private function resolveNullableType(NullableType $nullableType): null|NullableT private function resolveUnionTypes(PhpParserUnionType $phpParserUnionType): ?PhpParserUnionType { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return null; } @@ -303,7 +303,7 @@ private function resolveIntersectionPartNames(Node $node): array private function resolveUnionTypeNode(PhpParserUnionType $phpParserUnionType): ?PhpParserUnionType { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_80)) { return null; } diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php index 94f71a54fbf..7b771ba1807 100644 --- a/src/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php +++ b/src/PHPStanStaticTypeMapper/TypeMapper/VoidTypeMapper.php @@ -12,7 +12,7 @@ use Rector\Php\PhpVersionProvider; use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface; use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements TypeMapperInterface @@ -48,7 +48,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode */ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node { - if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::VOID_TYPE)) { + if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_71)) { return null; } diff --git a/src/PhpAttribute/AnnotationToAttributeMapper/DoctrineAnnotationAnnotationToAttributeMapper.php b/src/PhpAttribute/AnnotationToAttributeMapper/DoctrineAnnotationAnnotationToAttributeMapper.php index 999cf53f8e8..6399c2f8f4a 100644 --- a/src/PhpAttribute/AnnotationToAttributeMapper/DoctrineAnnotationAnnotationToAttributeMapper.php +++ b/src/PhpAttribute/AnnotationToAttributeMapper/DoctrineAnnotationAnnotationToAttributeMapper.php @@ -13,7 +13,7 @@ use Rector\PhpAttribute\AnnotationToAttributeMapper; use Rector\PhpAttribute\AttributeArrayNameInliner; use Rector\PhpAttribute\Contract\AnnotationToAttributeMapperInterface; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @implements AnnotationToAttributeMapperInterface @@ -42,7 +42,7 @@ public function isCandidate(mixed $value): bool return false; } - return $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::NEW_INITIALIZERS); + return $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_81); } /** diff --git a/src/PhpParser/Node/NodeFactory.php b/src/PhpParser/Node/NodeFactory.php index e67c1f4aed3..ed54bdcaa04 100644 --- a/src/PhpParser/Node/NodeFactory.php +++ b/src/PhpParser/Node/NodeFactory.php @@ -59,7 +59,7 @@ use Rector\PHPStanStaticTypeMapper\Enum\TypeKind; use Rector\PostRector\ValueObject\PropertyMetadata; use Rector\StaticTypeMapper\StaticTypeMapper; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; /** * @see \Rector\Tests\PhpParser\Node\NodeFactoryTest @@ -297,7 +297,7 @@ public function createPromotedPropertyParam(PropertyMetadata $propertyMetadata): $param->flags = $propertyFlags !== 0 ? $propertyFlags : Modifiers::PRIVATE; // make readonly by default - if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::READONLY_PROPERTY)) { + if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersion::PHP_81)) { $param->flags |= Modifiers::READONLY; } diff --git a/src/ValueObject/PhpVersionFeature.php b/src/ValueObject/PhpVersionFeature.php index a102220e980..8f553a66795 100644 --- a/src/ValueObject/PhpVersionFeature.php +++ b/src/ValueObject/PhpVersionFeature.php @@ -4,6 +4,10 @@ namespace Rector\ValueObject; +/** + * @api + * @deprecated Use \Rector\ValueObject\PhpVersion constants directly instead. + */ final class PhpVersionFeature { public const int PROPERTY_MODIFIER = PhpVersion::PHP_52; diff --git a/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php b/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php index 78252463a5e..3df7fe9d6a8 100644 --- a/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php +++ b/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php @@ -22,7 +22,7 @@ use Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute; use Rector\Rector\AbstractRector; use Rector\Tests\Issues\Issue9388\Source\AnnotationToAttribute\AttributeDecorator; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; use Rector\VersionBonding\Contract\MinPhpVersionInterface; use Rector\RuleDoc\CodeSample\CodeSample; use Rector\RuleDoc\RuleDefinition; @@ -111,7 +111,7 @@ public function refactor(Node $node): ?Node public function provideMinPhpVersion(): int { - return PhpVersionFeature::ATTRIBUTES; + return PhpVersion::PHP_80; } /** diff --git a/tests/Issues/Issue9388/config/configured_rule.php b/tests/Issues/Issue9388/config/configured_rule.php index 45aa0ee0743..a46033761f1 100644 --- a/tests/Issues/Issue9388/config/configured_rule.php +++ b/tests/Issues/Issue9388/config/configured_rule.php @@ -6,7 +6,7 @@ use Rector\Renaming\Rector\Name\RenameClassRector; use Rector\Tests\Issues\Issue9388\Source\AnnotationToAttribute\ValidateAttributeDecorator; use Rector\Tests\Issues\Issue9388\Source\Rule\ExtbaseAnnotationToAttributeRector; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { // AttributeDecorator receives every AttributeDecoratorInterface implementation through its @@ -15,11 +15,11 @@ $rectorConfig->singleton(ValidateAttributeDecorator::class); $rectorConfig->importNames(false, false); - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [ 'TYPO3\CMS\Extbase\Mvc\Web\Request' => 'TYPO3\CMS\Extbase\Mvc\Request', ]); $rectorConfig->rule(ExtbaseAnnotationToAttributeRector::class); - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); }; diff --git a/tests/Issues/ScopeNotAvailable/config/array_annotation_to_attribute.php b/tests/Issues/ScopeNotAvailable/config/array_annotation_to_attribute.php index fbdf4379995..30269fa5dff 100644 --- a/tests/Issues/ScopeNotAvailable/config/array_annotation_to_attribute.php +++ b/tests/Issues/ScopeNotAvailable/config/array_annotation_to_attribute.php @@ -6,10 +6,10 @@ use Rector\Php54\Rector\Array_\LongArrayToShortArrayRector; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; -use Rector\ValueObject\PhpVersionFeature; +use Rector\ValueObject\PhpVersion; return static function (RectorConfig $rectorConfig): void { - $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES); + $rectorConfig->phpVersion(PhpVersion::PHP_80); $rectorConfig->rule(LongArrayToShortArrayRector::class); diff --git a/tests/NodeManipulator/ClassDependencyManipulatorTest.php b/tests/NodeManipulator/ClassDependencyManipulatorTest.php index 282ebb31dc4..e1cd607478f 100644 --- a/tests/NodeManipulator/ClassDependencyManipulatorTest.php +++ b/tests/NodeManipulator/ClassDependencyManipulatorTest.php @@ -23,7 +23,6 @@ use Rector\PostRector\ValueObject\PropertyMetadata; use Rector\Testing\PHPUnit\AbstractLazyTestCase; use Rector\ValueObject\PhpVersion; -use Rector\ValueObject\PhpVersionFeature; final class ClassDependencyManipulatorTest extends AbstractLazyTestCase { @@ -40,7 +39,7 @@ protected function setUp(): void $this->printerStandard = new Standard(); // use at least readonly property - SimpleParameterProvider::setParameter(Option::PHP_VERSION_FEATURES, PhpVersionFeature::READONLY_PROPERTY); + SimpleParameterProvider::setParameter(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_81); } protected function tearDown(): void