octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit a0d324465a4cbccb9236bc69f41069da89d01baf 

a0d324465a [Php74][Php81] Allow mixed key on ArraySpreadInsteadOfArrayMergeRector on php 8.1 version feature enabled (#5190)
This commit is contained in:
Tomas Votruba 2023-10-22 10:12:20 +00:00
parent 440cc19f16
commit c6f40053b8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
View File

@ -96,6 +96,9 @@ CODE_SAMPLE
}
private function refactorArray(FuncCall $funcCall) : ?Array_
{
if ($funcCall->isFirstClassCallable()) {
return null;
}
$array = new Array_();
foreach ($funcCall->args as $arg) {
if (!$arg instanceof Arg) {
@ -135,10 +138,8 @@ CODE_SAMPLE
if ($arrayType->getKeyType()->isInteger()->yes()) {
return \true;
}
if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ARRAY_SPREAD_STRING_KEYS)) {
return \false;
}
return $arrayType->getKeyType()->isString()->yes();
// php 8.1+ allow mixed key: int, string, and null
return $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ARRAY_SPREAD_STRING_KEYS);
}
private function resolveValue(Expr $expr) : Expr
{

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5ac3cb377abf968396c23573d8562e6ab6967f2a';
public const PACKAGE_VERSION = 'a0d324465a4cbccb9236bc69f41069da89d01baf';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-10-19 20:44:46';
public const RELEASE_DATE = '2023-10-22 12:09:33';
/**
* @var int
*/