Skip to content

Commit 2e5a667

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit f02a2f4ae37d09b4d4e067e26ec2b0eddcbb7ab2
rectorphp/rector-src@f02a2f4 Rectify (#6945)
1 parent b1563d0 commit 2e5a667

26 files changed

Lines changed: 1219 additions & 922 deletions

‎src/PhpParser/NodeFinder/PropertyFetchFinder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function isLocalPropertyFetchByName(Expr $expr, $class, string $propertyN
162162
private function resolveNodesToLocate(Class_ $class) : array
163163
{
164164
$propertyWithHooks = \array_filter($class->getProperties(), fn(Property $property): bool => $property->hooks !== []);
165-
return \array_merge($propertyWithHooks, $class->getMethods());
165+
return [...$propertyWithHooks, ...$class->getMethods()];
166166
}
167167
/**
168168
* @param Stmt[] $stmts

‎vendor/composer/autoload_classmap.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,8 @@
14121412
'Rector\\Doctrine\\Dbal211\\Rector\\MethodCall\\ExtractArrayArgOnQueryBuilderSelectRector' => $vendorDir . '/rector/rector-doctrine/rules/Dbal211/Rector/MethodCall/ExtractArrayArgOnQueryBuilderSelectRector.php',
14131413
'Rector\\Doctrine\\Dbal211\\Rector\\MethodCall\\ReplaceFetchAllMethodCallRector' => $vendorDir . '/rector/rector-doctrine/rules/Dbal211/Rector/MethodCall/ReplaceFetchAllMethodCallRector.php',
14141414
'Rector\\Doctrine\\Dbal40\\Rector\\MethodCall\\ChangeCompositeExpressionAddMultipleWithWithRector' => $vendorDir . '/rector/rector-doctrine/rules/Dbal40/Rector/MethodCall/ChangeCompositeExpressionAddMultipleWithWithRector.php',
1415+
'Rector\\Doctrine\\Dbal40\\Rector\\StmtsAwareInterface\\ExecuteQueryParamsToBindValueRector' => $vendorDir . '/rector/rector-doctrine/rules/Dbal40/Rector/StmtsAwareInterface/ExecuteQueryParamsToBindValueRector.php',
1416+
'Rector\\Doctrine\\Dbal42\\Rector\\New_\\AddArrayResultColumnNamesRector' => $vendorDir . '/rector/rector-doctrine/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php',
14151417
'Rector\\Doctrine\\DoctrineFixture\\Rector\\MethodCall\\AddGetReferenceTypeRector' => $vendorDir . '/rector/rector-doctrine/rules/DoctrineFixture/Rector/MethodCall/AddGetReferenceTypeRector.php',
14161418
'Rector\\Doctrine\\DoctrineFixture\\Reflection\\ParameterTypeResolver' => $vendorDir . '/rector/rector-doctrine/rules/DoctrineFixture/Reflection/ParameterTypeResolver.php',
14171419
'Rector\\Doctrine\\Enum\\DoctrineClass' => $vendorDir . '/rector/rector-doctrine/src/Enum/DoctrineClass.php',

‎vendor/composer/autoload_static.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,6 +1631,8 @@ class ComposerStaticInit912e02b74e97bb7d91c242d9973e0c44
16311631
'Rector\\Doctrine\\Dbal211\\Rector\\MethodCall\\ExtractArrayArgOnQueryBuilderSelectRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/Dbal211/Rector/MethodCall/ExtractArrayArgOnQueryBuilderSelectRector.php',
16321632
'Rector\\Doctrine\\Dbal211\\Rector\\MethodCall\\ReplaceFetchAllMethodCallRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/Dbal211/Rector/MethodCall/ReplaceFetchAllMethodCallRector.php',
16331633
'Rector\\Doctrine\\Dbal40\\Rector\\MethodCall\\ChangeCompositeExpressionAddMultipleWithWithRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/Dbal40/Rector/MethodCall/ChangeCompositeExpressionAddMultipleWithWithRector.php',
1634+
'Rector\\Doctrine\\Dbal40\\Rector\\StmtsAwareInterface\\ExecuteQueryParamsToBindValueRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/Dbal40/Rector/StmtsAwareInterface/ExecuteQueryParamsToBindValueRector.php',
1635+
'Rector\\Doctrine\\Dbal42\\Rector\\New_\\AddArrayResultColumnNamesRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/Dbal42/Rector/New_/AddArrayResultColumnNamesRector.php',
16341636
'Rector\\Doctrine\\DoctrineFixture\\Rector\\MethodCall\\AddGetReferenceTypeRector' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/DoctrineFixture/Rector/MethodCall/AddGetReferenceTypeRector.php',
16351637
'Rector\\Doctrine\\DoctrineFixture\\Reflection\\ParameterTypeResolver' => __DIR__ . '/..' . '/rector/rector-doctrine/rules/DoctrineFixture/Reflection/ParameterTypeResolver.php',
16361638
'Rector\\Doctrine\\Enum\\DoctrineClass' => __DIR__ . '/..' . '/rector/rector-doctrine/src/Enum/DoctrineClass.php',

‎vendor/composer/installed.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -709,17 +709,17 @@
709709
},
710710
{
711711
"name": "nikic\/php-parser",
712-
"version": "v5.4.0",
713-
"version_normalized": "5.4.0.0",
712+
"version": "v5.5.0",
713+
"version_normalized": "5.5.0.0",
714714
"source": {
715715
"type": "git",
716716
"url": "https:\/\/github.com\/nikic\/PHP-Parser.git",
717-
"reference": "447a020a1f875a434d62f2a401f53b82a396e494"
717+
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
718718
},
719719
"dist": {
720720
"type": "zip",
721-
"url": "https:\/\/api.github.com\/repos\/nikic\/PHP-Parser\/zipball\/447a020a1f875a434d62f2a401f53b82a396e494",
722-
"reference": "447a020a1f875a434d62f2a401f53b82a396e494",
721+
"url": "https:\/\/api.github.com\/repos\/nikic\/PHP-Parser\/zipball\/ae59794362fe85e051a58ad36b289443f57be7a9",
722+
"reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
723723
"shasum": ""
724724
},
725725
"require": {
@@ -732,7 +732,7 @@
732732
"ircmaxell\/php-yacc": "^0.0.7",
733733
"phpunit\/phpunit": "^9.0"
734734
},
735-
"time": "2024-12-30T11:07:19+00:00",
735+
"time": "2025-05-31T08:24:38+00:00",
736736
"bin": [
737737
"bin\/php-parse"
738738
],
@@ -782,7 +782,7 @@
782782
],
783783
"support": {
784784
"issues": "https:\/\/github.com\/nikic\/PHP-Parser\/issues",
785-
"source": "https:\/\/github.com\/nikic\/PHP-Parser\/tree\/v5.4.0"
785+
"source": "https:\/\/github.com\/nikic\/PHP-Parser\/tree\/v5.5.0"
786786
},
787787
"install-path": "..\/nikic\/php-parser"
788788
},
@@ -1687,12 +1687,12 @@
16871687
"source": {
16881688
"type": "git",
16891689
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
1690-
"reference": "f3e5d75fc7ba1aa8421e4709ec150c3b3fbbdb11"
1690+
"reference": "9686a88ce54080d062ff39aeda57e36dcc85cf7f"
16911691
},
16921692
"dist": {
16931693
"type": "zip",
1694-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/f3e5d75fc7ba1aa8421e4709ec150c3b3fbbdb11",
1695-
"reference": "f3e5d75fc7ba1aa8421e4709ec150c3b3fbbdb11",
1694+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/9686a88ce54080d062ff39aeda57e36dcc85cf7f",
1695+
"reference": "9686a88ce54080d062ff39aeda57e36dcc85cf7f",
16961696
"shasum": ""
16971697
},
16981698
"require": {
@@ -1715,7 +1715,7 @@
17151715
"tomasvotruba\/class-leak": "^2.0",
17161716
"tracy\/tracy": "^2.10"
17171717
},
1718-
"time": "2025-05-28T23:02:46+00:00",
1718+
"time": "2025-05-31T20:29:38+00:00",
17191719
"default-branch": true,
17201720
"type": "rector-extension",
17211721
"extra": {

‎vendor/composer/installed.php‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎vendor/nikic/php-parser/lib/PhpParser/Node/MatchArm.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ class MatchArm extends NodeAbstract
99
{
1010
/** @var null|list<Node\Expr> */
1111
public ?array $conds;
12-
/** @var Node\Expr */
1312
public \PhpParser\Node\Expr $body;
1413
/**
1514
* @param null|list<Node\Expr> $conds

‎vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class ClassLike extends Node\Stmt
1616
/** @var Node\Name|null Namespaced name (if using NameResolver) */
1717
public ?Node\Name $namespacedName;
1818
/**
19-
* @return TraitUse[]
19+
* @return list<TraitUse>
2020
*/
2121
public function getTraitUses() : array
2222
{
@@ -29,7 +29,7 @@ public function getTraitUses() : array
2929
return $traitUses;
3030
}
3131
/**
32-
* @return ClassConst[]
32+
* @return list<ClassConst>
3333
*/
3434
public function getConstants() : array
3535
{
@@ -42,7 +42,7 @@ public function getConstants() : array
4242
return $constants;
4343
}
4444
/**
45-
* @return Property[]
45+
* @return list<Property>
4646
*/
4747
public function getProperties() : array
4848
{
@@ -77,7 +77,7 @@ public function getProperty(string $name) : ?\PhpParser\Node\Stmt\Property
7777
/**
7878
* Gets all methods defined directly in this class/interface/trait
7979
*
80-
* @return ClassMethod[]
80+
* @return list<ClassMethod>
8181
*/
8282
public function getMethods() : array
8383
{

‎vendor/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@ class Const_ extends Node\Stmt
88
{
99
/** @var Node\Const_[] Constant declarations */
1010
public array $consts;
11+
/** @var Node\AttributeGroup[] PHP attribute groups */
12+
public array $attrGroups;
1113
/**
1214
* Constructs a const list node.
1315
*
1416
* @param Node\Const_[] $consts Constant declarations
1517
* @param array<string, mixed> $attributes Additional attributes
18+
* @param list<Node\AttributeGroup> $attrGroups PHP attribute groups
1619
*/
17-
public function __construct(array $consts, array $attributes = [])
20+
public function __construct(array $consts, array $attributes = [], array $attrGroups = [])
1821
{
1922
$this->attributes = $attributes;
23+
$this->attrGroups = $attrGroups;
2024
$this->consts = $consts;
2125
}
2226
public function getSubNodeNames() : array
2327
{
24-
return ['consts'];
28+
return ['attrGroups', 'consts'];
2529
}
2630
public function getType() : string
2731
{

‎vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected function dumpRecursive($node, bool $indent = \true) : void
131131
} elseif ($node instanceof \PhpParser\Comment) {
132132
$this->res .= \str_replace("\n", $this->nl, $node->getReformattedText());
133133
} elseif (\is_string($node)) {
134-
$this->res .= \str_replace("\n", $this->nl, (string) $node);
134+
$this->res .= \str_replace("\n", $this->nl, $node);
135135
} elseif (\is_int($node) || \is_float($node)) {
136136
$this->res .= $node;
137137
} elseif (null === $node) {

‎vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class FindingVisitor extends NodeVisitorAbstract
1313
{
1414
/** @var callable Filter callback */
1515
protected $filterCallback;
16-
/** @var Node[] Found nodes */
16+
/** @var list<Node> Found nodes */
1717
protected array $foundNodes;
1818
public function __construct(callable $filterCallback)
1919
{
@@ -24,7 +24,7 @@ public function __construct(callable $filterCallback)
2424
*
2525
* Nodes are returned in pre-order.
2626
*
27-
* @return Node[] Found nodes
27+
* @return list<Node> Found nodes
2828
*/
2929
public function getFoundNodes() : array
3030
{

0 commit comments

Comments
 (0)