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 a3d2fcda640abe4af03822e415c5fbe757c2f88c 

a3d2fcda64 [NodeTypeResolver] Use Scope->getType() on ArrayDimFetch on NodeTypeResolver::getNativeType() (#5037)
This commit is contained in:
Tomas Votruba 2023-09-18 22:07:04 +00:00
parent d7b6d352e5
commit e43f2a6386
6 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/NodeTypeResolver/NodeTypeResolver.php
View File

@ -5,6 +5,7 @@ namespace Rector\NodeTypeResolver;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\BinaryOp\Coalesce;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\ConstFetch;
@ -226,25 +227,17 @@ final class NodeTypeResolver
return $type;
}
}
$type = $scope->getNativeType($expr);
/**
* ArrayDimFetch got type by its Scope->getType(), otherwise, it got MixedType
*/
$type = $expr instanceof ArrayDimFetch ? $scope->getType($expr) : $scope->getNativeType($expr);
if (!$type instanceof UnionType) {
if ($this->isAnonymousObjectType($type)) {
return new ObjectWithoutClassType();
}
return $this->accessoryNonEmptyStringTypeCorrector->correct($type);
}
$hasChanged = \false;
$types = $type->getTypes();
foreach ($types as $key => $childType) {
if ($this->isAnonymousObjectType($childType)) {
$types[$key] = new ObjectWithoutClassType();
$hasChanged = \true;
}
}
if ($hasChanged) {
return $this->accessoryNonEmptyStringTypeCorrector->correct(new UnionType($types));
}
return $this->accessoryNonEmptyStringTypeCorrector->correct($type);
return $this->resolveNativeUnionType($type);
}
public function isNumberType(Expr $expr) : bool
{
@ -302,6 +295,21 @@ final class NodeTypeResolver
}
return $classReflection->isSubclassOf($objectType->getClassName());
}
private function resolveNativeUnionType(UnionType $unionType) : Type
{
$hasChanged = \false;
$types = $unionType->getTypes();
foreach ($types as $key => $childType) {
if ($this->isAnonymousObjectType($childType)) {
$types[$key] = new ObjectWithoutClassType();
$hasChanged = \true;
}
}
if ($hasChanged) {
return $this->accessoryNonEmptyStringTypeCorrector->correct(new UnionType($types));
}
return $this->accessoryNonEmptyStringTypeCorrector->correct($unionType);
}
private function isMatchObjectWithoutClassType(ObjectWithoutClassType $objectWithoutClassType, ObjectType $requiredObjectType) : bool
{
if ($objectWithoutClassType instanceof ObjectWithoutClassTypeWithParentTypes) {

10
rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php
View File

@ -87,7 +87,7 @@ CODE_SAMPLE
}
$empty = $booleanNot->expr;
if ($empty->expr instanceof ArrayDimFetch) {
return $this->createDimFetchBooleanAnd($empty);
return $this->createDimFetchBooleanAnd($empty->expr);
}
if ($this->exprAnalyzer->isNonTypedFromParam($empty->expr)) {
return null;
@ -103,11 +103,11 @@ CODE_SAMPLE
$exprType = $scope->getNativeType($empty->expr);
return $this->exactCompareFactory->createIdenticalFalsyCompare($exprType, $empty->expr, $treatAsNonEmpty);
}
private function createDimFetchBooleanAnd(Empty_ $empty) : ?BooleanAnd
private function createDimFetchBooleanAnd(ArrayDimFetch $arrayDimFetch) : ?BooleanAnd
{
$exprType = $this->getType($empty->expr);
$isset = new Isset_([$empty->expr]);
$compareExpr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $empty->expr, \false);
$exprType = $this->nodeTypeResolver->getNativeType($arrayDimFetch);
$isset = new Isset_([$arrayDimFetch]);
$compareExpr = $this->exactCompareFactory->createNotIdenticalFalsyCompare($exprType, $arrayDimFetch, \false);
if (!$compareExpr instanceof Expr) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '308178a058b057813283852029a7b2aaa026568a';
public const PACKAGE_VERSION = 'a3d2fcda640abe4af03822e415c5fbe757c2f88c';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-18 19:09:10';
public const RELEASE_DATE = '2023-09-19 00:04:14';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitfe52d60baf5fe3cb1eda5eb147e3a55d::getLoader();
return ComposerAutoloaderInita66a65e078de3f32eae2eef6f11a342a::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitfe52d60baf5fe3cb1eda5eb147e3a55d
class ComposerAutoloaderInita66a65e078de3f32eae2eef6f11a342a
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitfe52d60baf5fe3cb1eda5eb147e3a55d
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitfe52d60baf5fe3cb1eda5eb147e3a55d', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita66a65e078de3f32eae2eef6f11a342a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitfe52d60baf5fe3cb1eda5eb147e3a55d', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita66a65e078de3f32eae2eef6f11a342a', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita66a65e078de3f32eae2eef6f11a342a::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInita66a65e078de3f32eae2eef6f11a342a::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d
class ComposerStaticInita66a65e078de3f32eae2eef6f11a342a
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2596,9 +2596,9 @@ class ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfe52d60baf5fe3cb1eda5eb147e3a55d::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita66a65e078de3f32eae2eef6f11a342a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita66a65e078de3f32eae2eef6f11a342a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita66a65e078de3f32eae2eef6f11a342a::$classMap;
}, null, ClassLoader::class);
}