mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-23 11:14:38 +01:00
Code Issues Projects Releases Wiki Activity

fix PropertyNameReplacerRector

Browse Source
This commit is contained in:
TomasVotruba 2017-10-25 18:04:34 +02:00
parent 47a36505a8
commit 4808348557
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyFetchTypeResolver.php
View File

@ -51,7 +51,7 @@ final class PropertyFetchTypeResolver implements PerNodeTypeResolverInterface, N
}
if ($propertyFetchNode->var->name !== 'this') {
return null;
return [];
}
$propertyName = $this->resolvePropertyName($propertyFetchNode);

10
src/NodeAnalyzer/PropertyFetchAnalyzer.php
View File

@ -102,18 +102,20 @@ final class PropertyFetchAnalyzer
return false;
}
$variableNodeType = $node->var->getAttribute(Attribute::TYPES);
return in_array($variableNodeType, $types, true);
$variableNodeTypes = $node->var->getAttribute(Attribute::TYPES);
return (bool) array_intersect($variableNodeTypes, $types);
}
/**
* @param string[] $types
* @return string[]
*/
public function matchTypes(Node $node, array $types): ?string
public function matchTypes(Node $node, array $types): array
{
if (! $this->isTypes($node, $types)) {
return null;
return [];
}
return $node->var->getAttribute(Attribute::TYPES);

36
src/Rector/Dynamic/PropertyNameReplacerRector.php
View File

@ -16,12 +16,12 @@ final class PropertyNameReplacerRector extends AbstractRector
*
* @var string[][]
*/
private $oldToNewPropertyByClass = [];
private $perClassOldToNewProperties = [];
/**
* @var string|null
* @var string[]
*/
private $activeType;
private $activeTypes = [];
/**
* @var PropertyFetchAnalyzer
@ -31,19 +31,19 @@ final class PropertyNameReplacerRector extends AbstractRector
/**
* @param string[][]
*/
public function __construct(array $oldToNewPropertyByClass, PropertyFetchAnalyzer $propertyFetchAnalyzer)
public function __construct(array $perClassOldToNewProperties, PropertyFetchAnalyzer $propertyFetchAnalyzer)
{
$this->oldToNewPropertyByClass = $oldToNewPropertyByClass;
$this->perClassOldToNewProperties = $perClassOldToNewProperties;
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
}
public function isCandidate(Node $node): bool
{
$this->activeType = null;
$this->activeTypes = null;
$matchedType = $this->propertyFetchAnalyzer->matchTypes($node, $this->getClasses());
if ($matchedType) {
$this->activeType = $matchedType;
$matchedTypes = $this->propertyFetchAnalyzer->matchTypes($node, $this->getClasses());
if ($matchedTypes) {
$this->activeTypes = $matchedTypes;
return true;
}
@ -56,7 +56,7 @@ final class PropertyNameReplacerRector extends AbstractRector
*/
public function refactor(Node $propertyFetchNode): ?Node
{
$oldToNewProperties = $this->oldToNewPropertyByClass[$this->activeType];
$oldToNewProperties = $this->matchOldToNewProperties();
$propertyName = $propertyFetchNode->name->name;
@ -80,6 +80,20 @@ final class PropertyNameReplacerRector extends AbstractRector
*/
private function getClasses(): array
{
return array_keys($this->oldToNewPropertyByClass);
return array_keys($this->perClassOldToNewProperties);
}
/**
* @return string[]
*/
private function matchOldToNewProperties(): array
{
foreach ($this->activeTypes as $activeType) {
if ($this->perClassOldToNewProperties[$activeType]) {
return $this->perClassOldToNewProperties[$activeType];
}
}
return [];
}
}