From f29097a1da625d4db786a4f1835450bc419998bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kr=C3=A1l?= Date: Mon, 13 Jul 2026 08:09:54 +0200 Subject: [PATCH] chore(composer): update dependencies --- build/ignored-rules.php | 10 ++++-- composer.json | 2 +- rules/rules.php | 68 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/build/ignored-rules.php b/build/ignored-rules.php index dcded71..9407002 100644 --- a/build/ignored-rules.php +++ b/build/ignored-rules.php @@ -23,6 +23,7 @@ use Rector\CodeQuality\Rector\Class_\RemoveReadonlyPropertyVisibilityOnReadonlyClassRector; use Rector\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector; use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector; +use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector; use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector; use Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector; use Rector\CodeQuality\Rector\FuncCall\CallUserFuncWithArrowFunctionToInlineRector; @@ -45,6 +46,7 @@ use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector; use Rector\CodeQuality\Rector\New_\NewStaticToNewSelfRector; use Rector\CodeQuality\Rector\Switch_\SingularSwitchToIfRector; +use Rector\CodeQuality\Rector\Switch_\SwitchTrueToIfRector; use Rector\CodeQuality\Rector\Ternary\NumberCompareToMaxFuncCallRector; use Rector\CodeQuality\Rector\Ternary\TernaryImplodeToImplodeRector; use Rector\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector; @@ -67,6 +69,7 @@ use Rector\CodingStyle\Rector\FuncCall\StrictArraySearchRector; use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector; +use Rector\CodingStyle\Rector\If_\AlternativeIfToBracketRector; use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector; use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector; use Rector\CodingStyle\Rector\Property\SplitGroupedPropertiesRector; @@ -286,6 +289,7 @@ use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictFluentReturnRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromSymfonySerializerRector; use Rector\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector; +use Rector\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector; use Rector\TypeDeclaration\Rector\ClassMethod\StringReturnTypeFromStrictScalarReturnsRector; use Rector\TypeDeclaration\Rector\ClassMethod\StringReturnTypeFromStrictStringReturnsRector; use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector; @@ -603,11 +607,13 @@ ArrowFunctionDelegatingCallToFirstClassCallableRector::class, ClosureDelegatingCallToFirstClassCallableRector::class, ArrayToFirstClassCallableRector::class, - SortNamedParamRector::class, PropertyHookRector::class, SimplifyQuoteEscapeRector::class, ConstAndTraitDeprecatedAttributeRector::class, SafeDeclareStrictTypesRector::class, - CoalesceToTernaryRector::class, NewInInitializerRector::class, + AlternativeIfToBracketRector::class, + JoinStringConcatRector::class, + StrictStringParamConcatRector::class, + SwitchTrueToIfRector::class, ]; diff --git a/composer.json b/composer.json index ca01279..c4287ae 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ ], "require": { "php": "^8.4", - "rector/rector": "^2.4.5" + "rector/rector": "^2.5.6" }, "require-dev": { "roave/security-advisories": "dev-master", diff --git a/rules/rules.php b/rules/rules.php index ec6fe6f..dbe26de 100644 --- a/rules/rules.php +++ b/rules/rules.php @@ -3,8 +3,11 @@ declare(strict_types = 1); use Rector\CodeQuality\Rector\Assign\CombinedAssignRector; +use Rector\CodeQuality\Rector\AssignOp\NewArrayItemConcatAssignToAssignRector; +use Rector\CodeQuality\Rector\Attribute\ExplicitAttributeNamedArgsRector; use Rector\CodeQuality\Rector\Attribute\SortAttributeNamedArgsRector; use Rector\CodeQuality\Rector\BooleanAnd\RepeatedAndNotEqualToNotInArrayRector; +use Rector\CodeQuality\Rector\BooleanNot\NegatedAndsToPositiveOrsRector; use Rector\CodeQuality\Rector\BooleanOr\RepeatedOrEqualToInArrayRector; use Rector\CodeQuality\Rector\CallLike\AddNameToBooleanArgumentRector; use Rector\CodeQuality\Rector\CallLike\AddNameToNullArgumentRector; @@ -12,13 +15,13 @@ use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; use Rector\CodeQuality\Rector\Class_\ConvertStaticToSelfRector; use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector; +use Rector\CodeQuality\Rector\Class_\InnerFunctionToPrivateMethodRector; use Rector\CodeQuality\Rector\Class_\ReturnIteratorInDataProviderRector; use Rector\CodeQuality\Rector\ClassConstFetch\VariableConstFetchToClassConstFetchRector; use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector; use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector; use Rector\CodeQuality\Rector\Coalesce\CoalesceToTernaryRector; use Rector\CodeQuality\Rector\Concat\DirnameDirConcatStringToDirectStringPathRector; -use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector; use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector; use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector; use Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector; @@ -35,8 +38,10 @@ use Rector\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector; use Rector\CodeQuality\Rector\FuncCall\UnwrapSprintfOneArgumentRector; use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; +use Rector\CodeQuality\Rector\If_\ArrayExplicitBoolCompareRector; use Rector\CodeQuality\Rector\If_\CombineIfRector; use Rector\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector; +use Rector\CodeQuality\Rector\If_\ObjectExplicitBoolCompareRector; use Rector\CodeQuality\Rector\If_\ShortenElseIfRector; use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector; use Rector\CodeQuality\Rector\If_\SimplifyIfNotNullReturnRector; @@ -46,7 +51,9 @@ use Rector\CodeQuality\Rector\LogicalAnd\LogicalToBooleanRector; use Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector; use Rector\CodeQuality\Rector\NullsafeMethodCall\CleanupUnneededNullsafeOperatorRector; -use Rector\CodeQuality\Rector\Switch_\SwitchTrueToIfRector; +use Rector\CodeQuality\Rector\Property\FixClassCaseSensitivityVarDocblockRector; +use Rector\CodeQuality\Rector\StmtsAwareInterface\MoveInnerFunctionToTopLevelRector; +use Rector\CodeQuality\Rector\Switch_\SwitchTrueToMatchRector; use Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector; use Rector\CodeQuality\Rector\Ternary\SimplifyTautologyTernaryRector; use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector; @@ -63,15 +70,20 @@ use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector; use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector; use Rector\DeadCode\Rector\Cast\RecastingRemovalRector; +use Rector\DeadCode\Rector\Class_\RemoveRefactorDuplicatedNodeInstanceCheckRector; use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector; +use Rector\DeadCode\Rector\ClassMethod\RemoveDuplicatedReturnSelfDocblockRector; use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector; +use Rector\DeadCode\Rector\ClassMethod\RemoveMixedDocblockOverruledByNativeTypeRector; use Rector\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector; +use Rector\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector; +use Rector\DeadCode\Rector\ClassMethod\RemoveUselessUnionReturnDocblockRector; use Rector\DeadCode\Rector\ClassMethod\RemoveVoidDocblockFromMagicMethodRector; use Rector\DeadCode\Rector\Closure\RemoveUnusedClosureVariableUseRector; use Rector\DeadCode\Rector\For_\RemoveDeadIfForeachForRector; @@ -80,6 +92,7 @@ use Rector\DeadCode\Rector\If_\ReduceAlwaysFalseIfOrRector; use Rector\DeadCode\Rector\If_\RemoveDeadIfBlockRector; use Rector\DeadCode\Rector\MethodCall\RemoveNullArgOnNullDefaultParamRector; +use Rector\DeadCode\Rector\MethodCall\RemoveNullNamedArgOnNullDefaultParamRector; use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector; use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; use Rector\DeadCode\Rector\Property\RemoveUselessReadOnlyTagRector; @@ -151,10 +164,13 @@ use Rector\Privatization\Rector\ClassConst\PrivatizeFinalClassConstantRector; use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; +use Rector\Renaming\Rector\MethodCall\RenameDeprecatedMethodCallRector; use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector; use Rector\TypeDeclaration\Rector\Class_\AddTestsVoidReturnTypeWhereNoReturnRector; use Rector\TypeDeclaration\Rector\Class_\PropertyTypeFromStrictSetterGetterRector; use Rector\TypeDeclaration\Rector\Class_\ReturnTypeFromStrictTernaryRector; +use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromContainerGetSetUpRector; +use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromGetRepositorySetUpRector; use Rector\TypeDeclaration\Rector\Class_\TypedStaticPropertyInBehatContextRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddParamFromDimFetchKeyUseRector; @@ -165,14 +181,19 @@ use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationRector; use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ArrayParamTypeByMethodCallTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\KnownMagicClassMethodTypeRector; +use Rector\TypeDeclaration\Rector\ClassMethod\NarrowBoolDocblockReturnTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictReturnsRector; use Rector\TypeDeclaration\Rector\ClassMethod\NumericReturnTypeFromStrictScalarReturnsRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ObjectParamTypeByMethodCallTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector; +use Rector\TypeDeclaration\Rector\ClassMethod\PrivateMethodReturnTypeFromStrictNewArrayRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNullableTypeRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromGetRepositoryDocblockRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnCastRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnDirectArrayRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; @@ -184,19 +205,24 @@ use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector; use Rector\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector; -use Rector\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ScalarParamTypeByMethodCallTypeRector; use Rector\TypeDeclaration\Rector\Closure\AddClosureNeverReturnTypeRector; use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector; +use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeFromAssertInstanceOfRector; use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector; +use Rector\TypeDeclaration\Rector\FuncCall\AddArrayAnyAllClosureParamTypeRector; use Rector\TypeDeclaration\Rector\FuncCall\AddArrayFunctionClosureParamTypeRector; use Rector\TypeDeclaration\Rector\FuncCall\AddArrowFunctionParamArrayWhereDimFetchRector; +use Rector\TypeDeclaration\Rector\FuncCall\NarrowArrayAnyAllNullableParamTypeRector; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeForArrayMapRector; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeForArrayReduceRector; use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeFromIterableMethodCallRector; +use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeFromVariableCallRector; use Rector\TypeDeclaration\Rector\FunctionLike\AddParamTypeSplFixedArrayRector; use Rector\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictSetUpRector; +use Rector\TypeDeclarationDocblocks\Rector\Class_\AddParamTypeToRefactorMethodRector; use Rector\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector; use Rector\TypeDeclarationDocblocks\Rector\Class_\AddVarArrayDocblockFromDimFetchAssignRector; use Rector\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector; @@ -214,6 +240,8 @@ use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockFromMethodCallDocblockRector; use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockGetterReturnArrayFromPropertyDocblockVarRector; use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector; +use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\NarrowArrayCollectionUnionReturnDocblockRector; +use Rector\TypeDeclarationDocblocks\Rector\Property\MergePhpstanDocTagIntoNativeRector; use Rector\Unambiguous\Rector\Expression\FluentSettersToStandaloneCallMethodRector; return [ @@ -251,7 +279,6 @@ ForeachItemsAssignToEmptyArrayToAssignRector::class, ForeachToInArrayRector::class, InlineArrayReturnAssignRector::class, - JoinStringConcatRector::class, LogicalToBooleanRector::class, RemoveSoleValueSprintfRector::class, ShortenElseIfRector::class, @@ -297,7 +324,6 @@ ReturnTypeFromStrictTypedPropertyRector::class, TypedPropertyFromStrictConstructorRector::class, ReadOnlyPropertyRector::class, - SwitchTrueToIfRector::class, IfIssetToCoalescingRector::class, CleanupUnneededNullsafeOperatorRector::class, ReadOnlyClassRector::class, @@ -335,9 +361,39 @@ DataProviderAnnotationToAttributeRector::class, TestWithAnnotationToAttributeRector::class, NumericReturnTypeFromStrictScalarReturnsRector::class, - StrictStringParamConcatRector::class, + RemoveDuplicatedReturnSelfDocblockRector::class, + RemoveNullNamedArgOnNullDefaultParamRector::class, + RemoveRefactorDuplicatedNodeInstanceCheckRector::class, + ExplicitAttributeNamedArgsRector::class, + NegatedAndsToPositiveOrsRector::class, + FixClassCaseSensitivityVarDocblockRector::class, + ObjectExplicitBoolCompareRector::class, + ArrayExplicitBoolCompareRector::class, + NewArrayItemConcatAssignToAssignRector::class, ReturnTypeFromStrictParamRector::class, + SwitchTrueToMatchRector::class, + MoveInnerFunctionToTopLevelRector::class, + InnerFunctionToPrivateMethodRector::class, + NarrowArrayCollectionUnionReturnDocblockRector::class, + MergePhpstanDocTagIntoNativeRector::class, + AddParamTypeToRefactorMethodRector::class, ReturnUnionTypeRector::class, + PrivateMethodReturnTypeFromStrictNewArrayRector::class, + ReturnTypeFromGetRepositoryDocblockRector::class, + ObjectParamTypeByMethodCallTypeRector::class, + TypedPropertyFromGetRepositorySetUpRector::class, + TypedPropertyFromContainerGetSetUpRector::class, + RemoveMixedDocblockOverruledByNativeTypeRector::class, + RemoveUselessUnionReturnDocblockRector::class, + RemoveReturnTagIncompatibleWithNativeTypeRector::class, + RenameDeprecatedMethodCallRector::class, + ClosureReturnTypeFromAssertInstanceOfRector::class, + AddArrayAnyAllClosureParamTypeRector::class, + NarrowArrayAnyAllNullableParamTypeRector::class, + AddClosureParamTypeFromVariableCallRector::class, + ArrayParamTypeByMethodCallTypeRector::class, + NarrowBoolDocblockReturnTypeRector::class, + ScalarParamTypeByMethodCallTypeRector::class, ReadOnlyClassRector::class, RemoveUselessReturnTagRector::class, RemoveUselessParamTagRector::class,