octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-26 20:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit bbd9d4fa2c6811c9c68984549d2c0dfb68232219

Browse Source 
bbd9d4fa2c [CodeQuality] Skip non typed property no default value never assigned on SimplifyEmptyCheckOnEmptyArrayRector (#3171)
This commit is contained in:
Tomas Votruba 2022-12-08 10:16:49 +00:00
parent 6cbbfd0d97
commit 7e4cd5dfba
7 changed files with 115 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rules/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector.php
View File

@ -13,10 +13,17 @@ use PhpParser\Node\Expr\Empty_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Identifier;
use PhpParser\Node\Stmt\Property;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\ArrayType;
use PHPStan\Type\MixedType;
use Rector\Core\NodeAnalyzer\ExprAnalyzer;
use Rector\Core\PhpParser\AstResolver;
use Rector\Core\Rector\AbstractScopeAwareRector;
use Rector\Core\Reflection\ReflectionResolver;
use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\AllAssignNodePropertyTypeInferer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -29,9 +36,27 @@ final class SimplifyEmptyCheckOnEmptyArrayRector extends AbstractScopeAwareRecto
* @var \Rector\Core\NodeAnalyzer\ExprAnalyzer
*/
private $exprAnalyzer;
public function __construct(ExprAnalyzer $exprAnalyzer)
/**
* @readonly
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
/**
* @readonly
* @var \Rector\Core\PhpParser\AstResolver
*/
private $astResolver;
/**
* @readonly
* @var \Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\AllAssignNodePropertyTypeInferer
*/
private $allAssignNodePropertyTypeInferer;
public function __construct(ExprAnalyzer $exprAnalyzer, ReflectionResolver $reflectionResolver, AstResolver $astResolver, AllAssignNodePropertyTypeInferer $allAssignNodePropertyTypeInferer)
{
$this->exprAnalyzer = $exprAnalyzer;
$this->reflectionResolver = $reflectionResolver;
$this->astResolver = $astResolver;
$this->allAssignNodePropertyTypeInferer = $allAssignNodePropertyTypeInferer;
}
public function getRuleDefinition() : RuleDefinition
{
@ -68,9 +93,36 @@ final class SimplifyEmptyCheckOnEmptyArrayRector extends AbstractScopeAwareRecto
if ($expr instanceof Variable) {
return !$this->exprAnalyzer->isNonTypedFromParam($expr);
}
if ($expr instanceof PropertyFetch) {
return \true;
if (!$expr instanceof PropertyFetch && !$expr instanceof StaticPropertyFetch) {
return \false;
}
return $expr instanceof StaticPropertyFetch;
if (!$expr->name instanceof Identifier) {
return \false;
}
$classReflection = $this->reflectionResolver->resolveClassReflection($expr);
if (!$classReflection instanceof ClassReflection) {
return \false;
}
$propertyName = $expr->name->toString();
if (!$classReflection->hasNativeProperty($propertyName)) {
return \false;
}
$phpPropertyReflection = $classReflection->getNativeProperty($propertyName);
$nativeType = $phpPropertyReflection->getNativeType();
if (!$nativeType instanceof MixedType) {
return $nativeType instanceof ArrayType;
}
$property = $this->astResolver->resolvePropertyFromPropertyReflection($phpPropertyReflection);
/**
* Skip property promotion mixed type for now, as:
*
* - require assign in default param check
* - check all assign of property promotion params under the class
*/
if (!$property instanceof Property) {
return \false;
}
$type = $this->allAssignNodePropertyTypeInferer->inferProperty($property);
return $type instanceof ArrayType;
}
}

23
rules/TypeDeclaration/Matcher/PropertyAssignMatcher.php
View File

@ -7,22 +7,15 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\NodeNameResolver\NodeNameResolver;
final class PropertyAssignMatcher
{
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer)
public function __construct(PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
/**
@ -32,16 +25,14 @@ final class PropertyAssignMatcher
*/
public function matchPropertyAssignExpr(Assign $assign, string $propertyName) : ?Expr
{
if ($this->propertyFetchAnalyzer->isPropertyFetch($assign->var)) {
if (!$this->nodeNameResolver->isName($assign->var, $propertyName)) {
return null;
}
$assignVar = $assign->var;
if ($this->propertyFetchAnalyzer->isLocalPropertyFetchName($assignVar, $propertyName)) {
return $assign->expr;
}
if ($assign->var instanceof ArrayDimFetch && $this->propertyFetchAnalyzer->isPropertyFetch($assign->var->var)) {
if (!$this->nodeNameResolver->isName($assign->var->var, $propertyName)) {
return null;
}
if (!$assignVar instanceof ArrayDimFetch) {
return null;
}
if ($this->propertyFetchAnalyzer->isLocalPropertyFetchName($assignVar->var, $propertyName)) {
return $assign->expr;
}
return null;

41
rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php
View File

@ -7,13 +7,18 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PhpParser\Node\Identifier;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Property;
use PhpParser\NodeTraverser;
use PHPStan\Type\ArrayType;
use PHPStan\Type\MixedType;
use PHPStan\Type\NullType;
use PHPStan\Type\Type;
use Rector\Core\NodeAnalyzer\ExprAnalyzer;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\PhpParser\Node\Value\ValueResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
@ -73,7 +78,12 @@ final class AssignToPropertyTypeInferer
* @var \Rector\Core\PhpParser\Node\Value\ValueResolver
*/
private $valueResolver;
public function __construct(ConstructorAssignDetector $constructorAssignDetector, PropertyAssignMatcher $propertyAssignMatcher, PropertyDefaultAssignDetector $propertyDefaultAssignDetector, NullTypeAssignDetector $nullTypeAssignDetector, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, TypeFactory $typeFactory, NodeTypeResolver $nodeTypeResolver, ExprAnalyzer $exprAnalyzer, ValueResolver $valueResolver)
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
public function __construct(ConstructorAssignDetector $constructorAssignDetector, PropertyAssignMatcher $propertyAssignMatcher, PropertyDefaultAssignDetector $propertyDefaultAssignDetector, NullTypeAssignDetector $nullTypeAssignDetector, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, TypeFactory $typeFactory, NodeTypeResolver $nodeTypeResolver, ExprAnalyzer $exprAnalyzer, ValueResolver $valueResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->constructorAssignDetector = $constructorAssignDetector;
$this->propertyAssignMatcher = $propertyAssignMatcher;
@ -84,16 +94,27 @@ final class AssignToPropertyTypeInferer
$this->nodeTypeResolver = $nodeTypeResolver;
$this->exprAnalyzer = $exprAnalyzer;
$this->valueResolver = $valueResolver;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
public function inferPropertyInClassLike(Property $property, string $propertyName, ClassLike $classLike) : ?Type
{
$assignedExprTypes = [];
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($classLike->stmts, function (Node $node) use($propertyName, &$assignedExprTypes) {
$hasAssignDynamicPropertyValue = \false;
$this->simpleCallableNodeTraverser->traverseNodesWithCallable($classLike->stmts, function (Node $node) use($propertyName, &$assignedExprTypes, &$hasAssignDynamicPropertyValue) : ?int {
if (!$node instanceof Assign) {
return null;
}
$expr = $this->propertyAssignMatcher->matchPropertyAssignExpr($node, $propertyName);
if (!$expr instanceof Expr) {
if (!$this->propertyFetchAnalyzer->isLocalPropertyFetch($node->var)) {
return null;
}
/** @var PropertyFetch|StaticPropertyFetch $assignVar */
$assignVar = $node->var;
if (!$assignVar->name instanceof Identifier) {
$hasAssignDynamicPropertyValue = \true;
return NodeTraverser::STOP_TRAVERSAL;
}
return null;
}
if ($this->exprAnalyzer->isNonTypedFromParam($node->expr)) {
@ -102,14 +123,28 @@ final class AssignToPropertyTypeInferer
$assignedExprTypes[] = $this->resolveExprStaticTypeIncludingDimFetch($node);
return null;
});
if ($hasAssignDynamicPropertyValue) {
return null;
}
if ($this->shouldAddNullType($classLike, $propertyName, $assignedExprTypes)) {
$assignedExprTypes[] = new NullType();
}
return $this->resolveTypeWithVerifyDefaultValue($property, $assignedExprTypes);
}
/**
* @param Type[] $assignedExprTypes
*/
private function resolveTypeWithVerifyDefaultValue(Property $property, array $assignedExprTypes) : ?Type
{
$defaultPropertyValue = $property->props[0]->default;
if ($assignedExprTypes === []) {
// not typed, never assigned, but has default value, then pull type from default value
if (!$property->type instanceof Node && $defaultPropertyValue instanceof Expr) {
return $this->nodeTypeResolver->getType($defaultPropertyValue);
}
return null;
}
$inferredType = $this->typeFactory->createMixedPassedOrUnionType($assignedExprTypes);
$defaultPropertyValue = $property->props[0]->default;
if ($this->shouldSkipWithDifferentDefaultValueType($defaultPropertyValue, $inferredType)) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '2848e0d0cc5b819ba90fb1393ee2607b9eac555d';
public const PACKAGE_VERSION = 'bbd9d4fa2c6811c9c68984549d2c0dfb68232219';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-12-08 11:06:59';
public const RELEASE_DATE = '2022-12-08 11:11:58';
/**
* @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 ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6::getLoader();
return ComposerAutoloaderInit79248adaa56d100c6027d1f1e9835a31::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6
class ComposerAutoloaderInit79248adaa56d100c6027d1f1e9835a31
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit79248adaa56d100c6027d1f1e9835a31', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit79248adaa56d100c6027d1f1e9835a31', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit79248adaa56d100c6027d1f1e9835a31::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit79248adaa56d100c6027d1f1e9835a31::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirea6a2b512d4f8e14b829d09b271c958a6($fileIdentifier, $file);
composerRequire79248adaa56d100c6027d1f1e9835a31($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInita6a2b512d4f8e14b829d09b271c958a6
* @param string $file
* @return void
*/
function composerRequirea6a2b512d4f8e14b829d09b271c958a6($fileIdentifier, $file)
function composerRequire79248adaa56d100c6027d1f1e9835a31($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 ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6
class ComposerStaticInit79248adaa56d100c6027d1f1e9835a31
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3020,9 +3020,9 @@ class ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita6a2b512d4f8e14b829d09b271c958a6::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit79248adaa56d100c6027d1f1e9835a31::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit79248adaa56d100c6027d1f1e9835a31::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit79248adaa56d100c6027d1f1e9835a31::$classMap;
}, null, ClassLoader::class);
}