Bump dev dependencies, PHPUnit 13 (#385)

TomasVotruba · web-flow · commit f154b8b36368 · 2026-07-30T14:17:26.000+02:00
diff --git a/composer.json b/composer.json
@@ -9,21 +9,21 @@
     "require-dev": {
         "boundwize/structarmed": "^0.14",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1.33",
+        "phpstan/phpstan": "^2.2",
         "phpstan/phpstan-webmozart-assert": "^2.0",
-        "phpunit/phpunit": "^11.5",
-        "rector/jack": "^0.5.1",
+        "phpunit/phpunit": "^13.2",
+        "rector/jack": "^1.0",
         "rector/rector-src": "dev-main",
-        "rector/swiss-knife": "^2.3",
-        "symplify/easy-coding-standard": "^13.0",
+        "rector/swiss-knife": "^2.4",
+        "symplify/easy-coding-standard": "^13.2",
         "symplify/phpstan-extensions": "^12.0",
-        "symplify/phpstan-rules": "^14.9",
+        "symplify/phpstan-rules": "^14.12",
         "symplify/rule-doc-generator": "^12.2",
         "symplify/vendor-patches": "^11.5",
         "tomasvotruba/class-leak": "^2.1",
         "tomasvotruba/type-coverage": "^2.3",
         "tomasvotruba/unused-public": "^2.2",
-        "tracy/tracy": "^2.11"
+        "tracy/tracy": "^2.12"
     },
     "autoload": {
         "psr-4": {
diff --git a/rules-tests/DowngradePhp85/Rector/Expression/DowngradeVoidCastRector/DowngradeVoidCastRectorTest.php b/rules-tests/DowngradePhp85/Rector/Expression/DowngradeVoidCastRector/DowngradeVoidCastRectorTest.php
@@ -12,7 +12,7 @@
 final class DowngradeVoidCastRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
-    #[RequiresPhp('8.5')]
+    #[RequiresPhp('>= 8.5.0')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/rules-tests/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector/DowngradePipeOperatorRectorTest.php b/rules-tests/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector/DowngradePipeOperatorRectorTest.php
@@ -12,7 +12,7 @@
 final class DowngradePipeOperatorRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
-    #[RequiresPhp('>= 8.5')]
+    #[RequiresPhp('>= 8.5.0')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
diff --git a/rules/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector.php b/rules/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector.php
@@ -211,7 +211,7 @@ private function removeParamTypeFromMethod(ClassMethod $classMethod, int $paramP
 
     private function hasParamAlreadyNonTyped(ClassMethod $classMethod): bool
     {
-        return array_all($classMethod->params, fn(Param $param): bool => !$param->type instanceof Node);
+        return array_all($classMethod->params, static fn (Param $param): bool => ! $param->type instanceof Node);
     }
 
     private function isSafeType(ClassReflection $classReflection, ClassMethod $classMethod): bool
diff --git a/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php b/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php
@@ -130,15 +130,15 @@ public function refactor(Node $node): ?array
      * Remove the right-side-most params by reference or empty from `list()`,
      * since they are not needed anymore.
      */
-    private function removeStaleParams(List_ | Array_ $node, int $rightSideRemovableParamsCount): void
+    private function removeStaleParams(List_|Array_ $node, int $rightSideRemovableParamsCount): void
     {
         $nodeItemsCount = count($node->items);
         if ($rightSideRemovableParamsCount > 0) {
             array_splice($node->items, $nodeItemsCount - $rightSideRemovableParamsCount);
         }
     }
 
-    private function shouldSkipAssign(Assign $assign, List_ | Array_ $arrayOrList): bool
+    private function shouldSkipAssign(Assign $assign, List_|Array_ $arrayOrList): bool
     {
         if (! $assign->expr instanceof Variable) {
             return true;
@@ -264,7 +264,7 @@ private function hasAllItemsByRef(array $items): bool
     /**
      * Return the key inside the ArrayItem, if provided, or the position otherwise
      */
-    private function getArrayItemKey(ArrayItem $arrayItem, int | string $position): int | string
+    private function getArrayItemKey(ArrayItem $arrayItem, int|string $position): int|string
     {
         if ($arrayItem->key instanceof String_) {
             return $arrayItem->key->value;
@@ -285,7 +285,7 @@ private function createAssignRefWithArrayDimFetch(
         Variable $assignVariable,
         Variable $exprVariable,
         array $nestedArrayIndexes,
-        string | int $arrayIndex
+        string|int $arrayIndex
     ): Expression {
         $nestedExprVariable = $exprVariable;
         foreach ($nestedArrayIndexes as $nestedArrayIndex) {
@@ -301,7 +301,7 @@ private function createAssignRefWithArrayDimFetch(
     }
 
     /**
-     * @param array<(ArrayItem | null)> $arrayItems
+     * @param array<(ArrayItem|null)> $arrayItems
      * @return ArrayItem[]
      */
     private function getItemsByRef(array $arrayItems, int $condition): array
diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php
@@ -248,7 +248,7 @@ private function getDifferentParamTypeFromReflectionMethod(
         return null;
     }
 
-    private function refactorParam(Param $param, ClassMethod | Function_ $functionLike): void
+    private function refactorParam(Param $param, ClassMethod|Function_ $functionLike): void
     {
         if (! $this->isNullableParam($param, $functionLike)) {
             return;
@@ -260,7 +260,7 @@ private function refactorParam(Param $param, ClassMethod | Function_ $functionLi
         $this->hasChanged = true;
     }
 
-    private function decorateWithDocBlock(ClassMethod | Function_ $functionLike, Param $param): void
+    private function decorateWithDocBlock(ClassMethod|Function_ $functionLike, Param $param): void
     {
         if (! $param->type instanceof Node) {
             return;
diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php
@@ -155,7 +155,7 @@ public function refactor(Node $node): ?Node
 
     private function resolveDifferentAncestorReturnType(
         ClassMethod $classMethod,
-        UnionType | NullableType | Name | Identifier | ComplexType $returnTypeNode
+        UnionType|NullableType|Name|Identifier|ComplexType $returnTypeNode
     ): Type {
         $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
         if (! $classReflection instanceof ClassReflection) {
@@ -261,6 +261,6 @@ private function isNullable(Type $parentReturnType, Type $returnType): bool
             return false;
         }
 
-        return array_any($parentReturnType->getTypes(), fn(Type $type): bool => $type->equals($returnType));
+        return array_any($parentReturnType->getTypes(), static fn (Type $type): bool => $type->equals($returnType));
     }
 }
diff --git a/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php b/rules/DowngradePhp74/Rector/FuncCall/DowngradeStripTagsCallWithArrayRector.php
@@ -143,7 +143,7 @@ private function shouldSkipFuncCall(FuncCall $funcCall): bool
     }
 
     private function createArrayFromString(
-        Array_ | Variable | PropertyFetch | ConstFetch | ClassConstFetch $expr
+        Array_|Variable|PropertyFetch|ConstFetch|ClassConstFetch $expr
     ): Concat {
         $args = [new Arg(new String_('><')), new Arg($expr)];
         $implodeFuncCall = new FuncCall(new Name('implode'), $args);
@@ -153,7 +153,7 @@ private function createArrayFromString(
     }
 
     private function createIsArrayTernaryFromExpression(
-        Variable | PropertyFetch | ConstFetch | ClassConstFetch $expr
+        Variable|PropertyFetch|ConstFetch|ClassConstFetch $expr
     ): Ternary {
         $isArrayFuncCall = new FuncCall(new Name('is_array'), [new Arg($expr)]);
         $nullNotIdentical = new NotIdentical($expr, $this->nodeFactory->createNull());
diff --git a/rules/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector.php b/rules/DowngradePhp74/Rector/LNumber/DowngradeNumericLiteralSeparatorRector.php
@@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
-    private function shouldSkip(Int_ | Float_ $node, mixed $rawValue): bool
+    private function shouldSkip(Int_|Float_ $node, mixed $rawValue): bool
     {
         if (! is_string($rawValue)) {
             return true;
diff --git a/rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php b/rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php
@@ -70,7 +70,7 @@ public function fillFromNamedArgs(
      * @return array<int, Arg>
      */
     public function fillFromJumpedNamedArgs(
-        FunctionReflection | MethodReflection | ReflectionFunction $functionLikeReflection,
+        FunctionReflection|MethodReflection|ReflectionFunction $functionLikeReflection,
         array $unnamedArgs,
         array $parameters
     ): array {
diff --git a/rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php b/rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php
@@ -26,7 +26,7 @@ public function __construct(
      * @return Arg[]
      */
     public function resolveFromReflection(
-        FunctionReflection | MethodReflection $functionLikeReflection,
+        FunctionReflection|MethodReflection $functionLikeReflection,
         array $currentArgs
     ): array {
         $extendedParametersAcceptor = ParametersAcceptorSelector::combineAcceptors(
diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
@@ -207,7 +207,7 @@ private function resolveIndentation(Node $node, AttributeGroup $attributeGroup,
     }
 
     private function cleanupEmptyAttrGroups(
-        ClassMethod | Property | Class_ | Interface_ | Param | Function_ $node
+        ClassMethod|Property|Class_|Interface_|Param|Function_ $node
     ): void {
         foreach ($node->attrGroups as $key => $attrGroup) {
             if ($attrGroup->attrs !== []) {
diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php
@@ -282,7 +282,7 @@ private function refactorInArrowFunction(
      * @return Case_[]
      */
     private function createSwitchCasesFromMatchArms(
-        Echo_ | Expression | Return_ $node,
+        Echo_|Expression|Return_ $node,
         Match_ $match,
         bool $isInsideArrayItem = false
     ): array {
@@ -312,7 +312,7 @@ private function createSwitchCasesFromMatchArms(
      * @return Stmt[]
      */
     private function createSwitchStmts(
-        Echo_ | Expression | Return_ $node,
+        Echo_|Expression|Return_ $node,
         MatchArm $matchArm,
         bool $isInsideArrayItem
     ): array {
diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php
@@ -150,7 +150,7 @@ private function refactorArrowFunctionReturn(ArrowFunction $arrowFunction): ?Clo
     /**
      * @return If_|Expression|Stmt[]|null
      */
-    private function refactorAssign(Assign $assign): If_ | Expression | null | array
+    private function refactorAssign(Assign $assign): If_|Expression|null|array
     {
         if (! $this->hasThrowInAssignExpr($assign)) {
             return null;
diff --git a/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector.php b/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrContainsRector.php
@@ -62,7 +62,7 @@ public function getNodeTypes(): array
      * @param FuncCall|BooleanNot $node
      * @return Identical|NotIdentical|null The refactored node.
      */
-    public function refactor(Node $node): Identical | NotIdentical | null
+    public function refactor(Node $node): Identical|NotIdentical|null
     {
         $funcCall = $this->matchStrContainsOrNotStrContains($node);
 
@@ -87,7 +87,7 @@ public function refactor(Node $node): Identical | NotIdentical | null
         return new NotIdentical($funcCall, $this->nodeFactory->createFalse());
     }
 
-    private function matchStrContainsOrNotStrContains(FuncCall | BooleanNot $expr): ?FuncCall
+    private function matchStrContainsOrNotStrContains(FuncCall|BooleanNot $expr): ?FuncCall
     {
         $expr = ($expr instanceof BooleanNot) ? $expr->expr : $expr;
         if (! $expr instanceof FuncCall) {
diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector.php
@@ -94,7 +94,7 @@ public function refactor(Node $node): ?Node
     /**
      * @param Arg[] $args
      */
-    private function removeNamedArguments(MethodCall | StaticCall | New_ | FuncCall $node, array $args): ?Node
+    private function removeNamedArguments(MethodCall|StaticCall|New_|FuncCall $node, array $args): ?Node
     {
         if ($node instanceof New_) {
             $functionLikeReflection = $this->reflectionResolver->resolveMethodReflectionFromNew($node);
diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionClassGetConstantsFilterRector.php
@@ -299,7 +299,7 @@ private function createIfs(
     /**
      * @return string[]
      */
-    private function resolveClassConstFetchNames(ClassConstFetch | BitwiseOr $value): array
+    private function resolveClassConstFetchNames(ClassConstFetch|BitwiseOr $value): array
     {
         if ($value instanceof ClassConstFetch) {
             $classConstFetchNames = [];
diff --git a/rules/DowngradePhp80/Reflection/DefaultParameterValueResolver.php b/rules/DowngradePhp80/Reflection/DefaultParameterValueResolver.php
@@ -20,7 +20,7 @@
 
 final class DefaultParameterValueResolver
 {
-    public function resolveFromParameterReflection(ParameterReflection $parameterReflection): Expr | null
+    public function resolveFromParameterReflection(ParameterReflection $parameterReflection): Expr|null
     {
         $defaultValueType = $parameterReflection->getDefaultValue();
         if (! $defaultValueType instanceof Type) {
@@ -34,7 +34,7 @@ public function resolveFromParameterReflection(ParameterReflection $parameterRef
         return $this->resolveValueFromType($defaultValueType);
     }
 
-    private function resolveValueFromType(Type $constantType): ConstFetch | Expr
+    private function resolveValueFromType(Type $constantType): ConstFetch|Expr
     {
         if ($constantType instanceof ConstantBooleanType) {
             return $this->resolveConstantBooleanType($constantType);
diff --git a/rules/DowngradePhp82/Rector/Class_/DowngradeUnionIntersectionRector.php b/rules/DowngradePhp82/Rector/Class_/DowngradeUnionIntersectionRector.php
@@ -4,12 +4,12 @@
 
 namespace Rector\DowngradePhp82\Rector\Class_;
 
-use PhpParser\Node\Identifier;
-use PhpParser\Node\Name;
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrowFunction;
 use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\IntersectionType;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
@@ -137,6 +137,6 @@ private function isUnionIntersection(?Node $node): bool
             return false;
         }
 
-        return array_any($node->types, fn(Identifier|Name|IntersectionType $type): bool => $type instanceof IntersectionType);
+        return array_any($node->types, static fn (Identifier|Name|IntersectionType $type): bool => $type instanceof IntersectionType);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`final class DowngradeVoidCastRectorTest extends AbstractRectorTestCase`
`13`	`13`	`{`
`14`	`14`	`#[DataProvider('provideData')]`
`15`		`- #[RequiresPhp('8.5')]`
	`15`	`+ #[RequiresPhp('>= 8.5.0')]`
`16`	`16`	`public function test(string $filePath): void`
`17`	`17`	`{`
`18`	`18`	`$this->doTestFile($filePath);`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private function removeParamTypeFromMethod(ClassMethod $classMethod, int $paramP`
`211`	`211`
`212`	`212`	`private function hasParamAlreadyNonTyped(ClassMethod $classMethod): bool`
`213`	`213`	`{`
`214`		`- return array_all($classMethod->params, fn(Param $param): bool => !$param->type instanceof Node);`
	`214`	`+ return array_all($classMethod->params, static fn (Param $param): bool => ! $param->type instanceof Node);`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`private function isSafeType(ClassReflection $classReflection, ClassMethod $classMethod): bool`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ private function getDifferentParamTypeFromReflectionMethod(`
`248`	`248`	`return null;`
`249`	`249`	`}`
`250`	`250`
`251`		`- private function refactorParam(Param $param, ClassMethod \| Function_ $functionLike): void`
	`251`	`+ private function refactorParam(Param $param, ClassMethod\|Function_ $functionLike): void`
`252`	`252`	`{`
`253`	`253`	`if (! $this->isNullableParam($param, $functionLike)) {`
`254`	`254`	`return;`
`@@ -260,7 +260,7 @@ private function refactorParam(Param $param, ClassMethod \| Function_ $functionLi`
`260`	`260`	`$this->hasChanged = true;`
`261`	`261`	`}`
`262`	`262`
`263`		`- private function decorateWithDocBlock(ClassMethod \| Function_ $functionLike, Param $param): void`
	`263`	`+ private function decorateWithDocBlock(ClassMethod\|Function_ $functionLike, Param $param): void`
`264`	`264`	`{`
`265`	`265`	`if (! $param->type instanceof Node) {`
`266`	`266`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function refactor(Node $node): ?Node`
`155`	`155`
`156`	`156`	`private function resolveDifferentAncestorReturnType(`
`157`	`157`	`ClassMethod $classMethod,`
`158`		`- UnionType \| NullableType \| Name \| Identifier \| ComplexType $returnTypeNode`
	`158`	`+ UnionType\|NullableType\|Name\|Identifier\|ComplexType $returnTypeNode`
`159`	`159`	`): Type {`
`160`	`160`	`$classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);`
`161`	`161`	`if (! $classReflection instanceof ClassReflection) {`
`@@ -261,6 +261,6 @@ private function isNullable(Type $parentReturnType, Type $returnType): bool`
`261`	`261`	`return false;`
`262`	`262`	`}`
`263`	`263`
`264`		`- return array_any($parentReturnType->getTypes(), fn(Type $type): bool => $type->equals($returnType));`
	`264`	`+ return array_any($parentReturnType->getTypes(), static fn (Type $type): bool => $type->equals($returnType));`
`265`	`265`	`}`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node`
`81`	`81`	`return $node;`
`82`	`82`	`}`
`83`	`83`
`84`		`- private function shouldSkip(Int_ \| Float_ $node, mixed $rawValue): bool`
	`84`	`+ private function shouldSkip(Int_\|Float_ $node, mixed $rawValue): bool`
`85`	`85`	`{`
`86`	`86`	`if (! is_string($rawValue)) {`
`87`	`87`	`return true;`