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

Updated Rector to commit ac072bc8af186b2c86256aa7d29e52bb608ece27

Browse Source 
ac072bc8af feat: add an option to skip renaming promoted property (#5457)
This commit is contained in:
Tomas Votruba 2024-01-11 23:02:48 +00:00
parent e61f4b3c7b
commit bebd959a24
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
View File

@ -99,6 +99,11 @@ final class ClassPropertyAssignToConstructorPromotionRector extends AbstractRect
* @var string
*/
public const INLINE_PUBLIC = 'inline_public';
/**
* @api
* @var string
*/
public const RENAME_PROPERTY = 'rename_property';
/**
* Default to false, which only apply changes:
*
@ -109,6 +114,11 @@ final class ClassPropertyAssignToConstructorPromotionRector extends AbstractRect
* @var bool
*/
private $inlinePublic = \false;
/**
* Set to false will skip property promotion when parameter and property have different names.
* @var bool
*/
private $renameProperty = \true;
public function __construct(PromotedPropertyCandidateResolver $promotedPropertyCandidateResolver, VariableRenamer $variableRenamer, ParamAnalyzer $paramAnalyzer, PropertyPromotionDocBlockMerger $propertyPromotionDocBlockMerger, MakePropertyPromotionGuard $makePropertyPromotionGuard, TypeComparator $typeComparator, ReflectionResolver $reflectionResolver, PropertyPromotionRenamer $propertyPromotionRenamer, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper)
{
$this->promotedPropertyCandidateResolver = $promotedPropertyCandidateResolver;
@ -145,11 +155,12 @@ class SomeClass
}
}
CODE_SAMPLE
, [\Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::INLINE_PUBLIC => \false])]);
, [\Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::INLINE_PUBLIC => \false, \Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::RENAME_PROPERTY => \true])]);
}
public function configure(array $configuration) : void
{
$this->inlinePublic = $configuration[self::INLINE_PUBLIC] ?? (bool) \current($configuration);
$this->inlinePublic = $configuration[self::INLINE_PUBLIC] ?? \false;
$this->renameProperty = $configuration[self::RENAME_PROPERTY] ?? \true;
}
/**
* @return array<class-string<Node>>
@ -185,15 +196,18 @@ CODE_SAMPLE
if (!$this->makePropertyPromotionGuard->isLegal($node, $classReflection, $property, $param, $this->inlinePublic)) {
continue;
}
$paramName = $this->getName($param);
// rename also following calls
$propertyName = $this->getName($property->props[0]);
if (!$this->renameProperty && $paramName !== $propertyName) {
continue;
}
// remove property from class
$propertyStmtKey = $property->getAttribute(AttributeKey::STMT_KEY);
unset($node->stmts[$propertyStmtKey]);
// remove assign in constructor
$assignStmtPosition = $promotionCandidate->getStmtPosition();
unset($constructClassMethod->stmts[$assignStmtPosition]);
$paramName = $this->getName($param);
// rename also following calls
$propertyName = $this->getName($property->props[0]);
/** @var string $oldName */
$oldName = $this->getName($param->var);
$this->variableRenamer->renameVariableInFunctionLike($constructClassMethod, $oldName, $propertyName, null);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f24b01ae0af6cdf4517fee0d74d79cc39d31f602';
public const PACKAGE_VERSION = 'ac072bc8af186b2c86256aa7d29e52bb608ece27';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-01-11 22:29:41';
public const RELEASE_DATE = '2024-01-12 00:00:19';
/**
* @var int
*/