Skip to content

Commit 558b94c

Browse files
committed
Updated Rector to commit a37dcf119f2ce7422dc82b8f29f40a255ec43e3b
rectorphp/rector-src@a37dcf1 [Php84] Skip non-array on ForeachToArray* rules (#7023)
1 parent 0b44760 commit 558b94c

6 files changed

Lines changed: 23 additions & 7 deletions

File tree

rules/Php84/Rector/Foreach_/ForeachToArrayAllRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ private function isValidForeachStructure(Foreach_ $foreach, Variable $assignedVa
129129
if (!$this->nodeComparator->areNodesEqual($assignment->var, $assignedVariable)) {
130130
return \false;
131131
}
132-
return $this->valueResolver->isFalse($assignment->expr);
132+
if (!$this->valueResolver->isFalse($assignment->expr)) {
133+
return \false;
134+
}
135+
$type = $this->nodeTypeResolver->getNativeType($foreach->expr);
136+
return $type->isArray()->yes();
133137
}
134138
}

rules/Php84/Rector/Foreach_/ForeachToArrayAnyRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ private function isValidForeachStructure(Foreach_ $foreach, Variable $assignedVa
127127
if (!$this->nodeComparator->areNodesEqual($assignment->var, $assignedVariable)) {
128128
return \false;
129129
}
130-
return $this->valueResolver->isTrue($assignment->expr);
130+
if (!$this->valueResolver->isTrue($assignment->expr)) {
131+
return \false;
132+
}
133+
$type = $this->nodeTypeResolver->getNativeType($foreach->expr);
134+
return $type->isArray()->yes();
131135
}
132136
}

rules/Php84/Rector/Foreach_/ForeachToArrayFindKeyRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ private function isValidForeachStructure(Foreach_ $foreach, Variable $assignedVa
132132
if (!$this->nodeComparator->areNodesEqual($assignment->var, $assignedVariable)) {
133133
return \false;
134134
}
135-
return $this->nodeComparator->areNodesEqual($assignment->expr, $foreach->keyVar);
135+
if (!$this->nodeComparator->areNodesEqual($assignment->expr, $foreach->keyVar)) {
136+
return \false;
137+
}
138+
$type = $this->nodeTypeResolver->getNativeType($foreach->expr);
139+
return $type->isArray()->yes();
136140
}
137141
}

rules/Php84/Rector/Foreach_/ForeachToArrayFindRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ private function isValidForeachStructure(Foreach_ $foreach, Variable $assignedVa
127127
if (!$this->nodeComparator->areNodesEqual($assignment->var, $assignedVariable)) {
128128
return \false;
129129
}
130-
return $this->nodeComparator->areNodesEqual($assignment->expr, $foreach->valueVar);
130+
if (!$this->nodeComparator->areNodesEqual($assignment->expr, $foreach->valueVar)) {
131+
return \false;
132+
}
133+
$type = $this->nodeTypeResolver->getNativeType($foreach->expr);
134+
return $type->isArray()->yes();
131135
}
132136
}

src/Application/VersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '3bc3c849b36368f898f9a79ff13a7c9cbed3ddae';
22+
public const PACKAGE_VERSION = 'a37dcf119f2ce7422dc82b8f29f40a255ec43e3b';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2025-06-25 16:55:43';
27+
public const RELEASE_DATE = '2025-06-26 23:34:29';
2828
/**
2929
* @var int
3030
*/

vendor/scoper-autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Restore the backup and ensure the excluded files are properly marked as loaded
1515
$GLOBALS['__composer_autoload_files'] = \array_merge(
1616
$existingComposerAutoloadFiles,
17-
\array_fill_keys(['5928a00fa978807cf85d90ec3f4b0147', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a'], true)
17+
\array_fill_keys(['0e6d7bf4a5811bfa5cf40c5ccd6fae6a', '5928a00fa978807cf85d90ec3f4b0147'], true)
1818
);
1919

2020
return $loader;

0 commit comments

Comments
 (0)