octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-28 23:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit e3727aad81

Browse Source 
e3727aad81 [DeadCode] Make private property removal dependent on local property fetches (#311)
This commit is contained in:
Tomas Votruba 2021-06-27 16:22:20 +00:00
parent 1f5182eaa4
commit 82fbf12196
17 changed files with 92 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/set/privatization.php
View File

@ -12,7 +12,6 @@ use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector;
use Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector;
use Rector\Privatization\Rector\Property\ChangeReadOnlyPropertyWithDefaultValueToConstantRector;
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivatePropertyRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator) : void {
$services = $containerConfigurator->services();
@ -22,7 +21,6 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
$services->set(\Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector::class);
$services->set(\Rector\Privatization\Rector\Class_\RepeatedLiteralToClassConstantRector::class);
$services->set(\Rector\Privatization\Rector\MethodCall\PrivatizeLocalGetterToPropertyRector::class);
$services->set(\Rector\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivatePropertyRector::class);
$services->set(\Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector::class);
$services->set(\Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector::class);
// buggy, requires more work

35
packages/NodeCollector/NodeCollector/NodeRepository.php
View File

@ -22,10 +22,6 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
*/
final class NodeRepository
{
/**
* @var \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector
*/
private $parsedPropertyFetchNodeCollector;
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
@ -42,41 +38,13 @@ final class NodeRepository
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
public function __construct(\Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver)
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver)
{
$this->parsedPropertyFetchNodeCollector = $parsedPropertyFetchNodeCollector;
$this->nodeNameResolver = $nodeNameResolver;
$this->parsedNodeCollector = $parsedNodeCollector;
$this->reflectionProvider = $reflectionProvider;
$this->nodeTypeResolver = $nodeTypeResolver;
}
/**
* @return PropertyFetch[]
*/
public function findPropertyFetchesByProperty(\PhpParser\Node\Stmt\Property $property) : array
{
/** @var string|null $className */
$className = $property->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
if ($className === null) {
return [];
}
$propertyName = $this->nodeNameResolver->getName($property);
return $this->parsedPropertyFetchNodeCollector->findPropertyFetchesByTypeAndName($className, $propertyName);
}
/**
* @return PropertyFetch[]
*/
public function findPropertyFetchesByPropertyFetch(\PhpParser\Node\Expr\PropertyFetch $propertyFetch) : array
{
$propertyFetcheeType = $this->nodeTypeResolver->getStaticType($propertyFetch->var);
if (!$propertyFetcheeType instanceof \PHPStan\Type\TypeWithClassName) {
return [];
}
$className = $this->nodeTypeResolver->getFullyQualifiedClassName($propertyFetcheeType);
/** @var string $propertyName */
$propertyName = $this->nodeNameResolver->getName($propertyFetch);
return $this->parsedPropertyFetchNodeCollector->findPropertyFetchesByTypeAndName($className, $propertyName);
}
public function hasClassChildren(\PhpParser\Node\Stmt\Class_ $desiredClass) : bool
{
$desiredClassName = $desiredClass->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
@ -96,6 +64,7 @@ final class NodeRepository
return \false;
}
/**
* @deprecated Use ReflectionProvider instead to resolve all the traits
* @return Trait_[]
*/
public function findUsedTraitsInClass(\PhpParser\Node\Stmt\ClassLike $classLike) : array

89
packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php
View File

@ -1,89 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\NodeCollector\NodeCollector;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeWithClassName;
use PHPStan\Type\UnionType;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
/**
* All parsed nodes grouped type
*/
final class ParsedPropertyFetchNodeCollector
{
/**
* @var array<string, array<string, PropertyFetch[]>>
*/
private $propertyFetchesByTypeAndName = [];
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
}
public function collect(\PhpParser\Node $node) : void
{
if (!$node instanceof \PhpParser\Node\Expr\PropertyFetch && !$node instanceof \PhpParser\Node\Expr\StaticPropertyFetch) {
return;
}
$propertyType = $this->resolvePropertyCallerType($node);
if ($propertyType instanceof \PHPStan\Type\MixedType) {
return;
}
// make sure name is valid
if ($node->name instanceof \PhpParser\Node\Expr\StaticCall || $node->name instanceof \PhpParser\Node\Expr\MethodCall) {
return;
}
$propertyName = $this->nodeNameResolver->getName($node->name);
if ($propertyName === null) {
return;
}
$this->addPropertyFetchWithTypeAndName($propertyType, $node, $propertyName);
}
/**
* @return PropertyFetch[]
*/
public function findPropertyFetchesByTypeAndName(string $className, string $propertyName) : array
{
return $this->propertyFetchesByTypeAndName[$className][$propertyName] ?? [];
}
/**
* @param PropertyFetch|StaticPropertyFetch $node
*/
private function resolvePropertyCallerType(\PhpParser\Node $node) : \PHPStan\Type\Type
{
if ($node instanceof \PhpParser\Node\Expr\PropertyFetch) {
return $this->nodeTypeResolver->resolve($node->var);
}
return $this->nodeTypeResolver->resolve($node->class);
}
/**
* @param PropertyFetch|StaticPropertyFetch $propertyFetchNode
*/
private function addPropertyFetchWithTypeAndName(\PHPStan\Type\Type $propertyType, \PhpParser\Node $propertyFetchNode, string $propertyName) : void
{
if ($propertyType instanceof \PHPStan\Type\TypeWithClassName) {
$this->propertyFetchesByTypeAndName[$propertyType->getClassName()][$propertyName][] = $propertyFetchNode;
}
if ($propertyType instanceof \PHPStan\Type\UnionType) {
foreach ($propertyType->getTypes() as $unionedType) {
$this->addPropertyFetchWithTypeAndName($unionedType, $propertyFetchNode, $propertyName);
}
}
}
}

9
packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php
View File

@ -6,28 +6,21 @@ namespace Rector\NodeCollector\NodeVisitor;
use PhpParser\Node;
use PhpParser\NodeVisitorAbstract;
use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
use Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector;
final class NodeCollectorNodeVisitor extends \PhpParser\NodeVisitorAbstract
{
/**
* @var \Rector\NodeCollector\NodeCollector\ParsedNodeCollector
*/
private $parsedNodeCollector;
/**
* @var \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector
*/
private $parsedPropertyFetchNodeCollector;
public function __construct(\Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector, \Rector\NodeCollector\NodeCollector\ParsedPropertyFetchNodeCollector $parsedPropertyFetchNodeCollector)
public function __construct(\Rector\NodeCollector\NodeCollector\ParsedNodeCollector $parsedNodeCollector)
{
$this->parsedNodeCollector = $parsedNodeCollector;
$this->parsedPropertyFetchNodeCollector = $parsedPropertyFetchNodeCollector;
}
public function enterNode(\PhpParser\Node $node)
{
if ($this->parsedNodeCollector->isCollectableNode($node)) {
$this->parsedNodeCollector->collect($node);
}
$this->parsedPropertyFetchNodeCollector->collect($node);
return null;
}
}

5
packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php
View File

@ -46,11 +46,10 @@ final class ReadWritePropertyAnalyzer
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @param PropertyFetch|StaticPropertyFetch $node
* @param \PhpParser\Node\Expr\PropertyFetch|\PhpParser\Node\Expr\StaticPropertyFetch $node
*/
public function isRead(\PhpParser\Node $node) : bool
public function isRead($node) : bool
{
\RectorPrefix20210627\Webmozart\Assert\Assert::isAnyOf($node, [\PhpParser\Node\Expr\PropertyFetch::class, \PhpParser\Node\Expr\StaticPropertyFetch::class]);
$parent = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);
if (!$parent instanceof \PhpParser\Node) {
throw new \Rector\Core\Exception\ShouldNotHappenException();

24
packages/ReadWrite/NodeFinder/NodeUsageFinder.php
View File

@ -5,12 +5,10 @@ namespace Rector\ReadWrite\NodeFinder;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Foreach_;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeCollector\NodeCollector\NodeRepository;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder;
final class NodeUsageFinder
@ -23,10 +21,6 @@ final class NodeUsageFinder
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
*/
private $nodeRepository;
/**
* @var \Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder
*/
@ -35,11 +29,10 @@ final class NodeUsageFinder
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository, \Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder $scopeAwareNodeFinder, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator)
public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\NodeNestingScope\NodeFinder\ScopeAwareNodeFinder $scopeAwareNodeFinder, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->nodeRepository = $nodeRepository;
$this->scopeAwareNodeFinder = $scopeAwareNodeFinder;
$this->nodeComparator = $nodeComparator;
}
@ -63,21 +56,6 @@ final class NodeUsageFinder
return $this->nodeNameResolver->isName($node, $variableName);
});
}
/**
* @return PropertyFetch[]
*/
public function findPropertyFetchUsages(\PhpParser\Node\Expr\PropertyFetch $desiredPropertyFetch) : array
{
$propertyFetches = $this->nodeRepository->findPropertyFetchesByPropertyFetch($desiredPropertyFetch);
$propertyFetchesWithoutPropertyFetch = [];
foreach ($propertyFetches as $propertyFetch) {
if ($propertyFetch === $desiredPropertyFetch) {
continue;
}
$propertyFetchesWithoutPropertyFetch[] = $propertyFetch;
}
return $propertyFetchesWithoutPropertyFetch;
}
public function findPreviousForeachNodeUsage(\PhpParser\Node\Stmt\Foreach_ $foreach, \PhpParser\Node\Expr $expr) : ?\PhpParser\Node
{
return $this->scopeAwareNodeFinder->findParent($foreach, function (\PhpParser\Node $node) use($expr) : bool {

60
packages/ReadWrite/ReadNodeAnalyzer/LocalPropertyFetchReadNodeAnalyzer.php Normal file
View File

@ -0,0 +1,60 @@
<?php
declare (strict_types=1);
namespace Rector\ReadWrite\ReadNodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Stmt\Class_;
use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface;
final class LocalPropertyFetchReadNodeAnalyzer implements \Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface
{
/**
* @var \Rector\ReadWrite\ReadNodeAnalyzer\JustReadExprAnalyzer
*/
private $justReadExprAnalyzer;
/**
* @var \Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder
*/
private $propertyFetchFinder;
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(\Rector\ReadWrite\ReadNodeAnalyzer\JustReadExprAnalyzer $justReadExprAnalyzer, \Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder $propertyFetchFinder, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
{
$this->justReadExprAnalyzer = $justReadExprAnalyzer;
$this->propertyFetchFinder = $propertyFetchFinder;
$this->nodeNameResolver = $nodeNameResolver;
}
public function supports(\PhpParser\Node $node) : bool
{
return $node instanceof \PhpParser\Node\Expr\PropertyFetch;
}
/**
* @param PropertyFetch $node
*/
public function isRead(\PhpParser\Node $node) : bool
{
$class = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NODE);
if (!$class instanceof \PhpParser\Node\Stmt\Class_) {
// assume worse to keep node protected
return \true;
}
$propertyName = $this->nodeNameResolver->getName($node->name);
if ($propertyName === null) {
// assume worse to keep node protected
return \true;
}
$propertyFetches = $this->propertyFetchFinder->findLocalPropertyFetchesByName($class, $propertyName);
foreach ($propertyFetches as $propertyFetch) {
if ($this->justReadExprAnalyzer->isReadContext($propertyFetch)) {
return \true;
}
}
return \false;
}
}

42
packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php
View File

@ -1,42 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\ReadWrite\ReadNodeAnalyzer;
use PhpParser\Node;
use PhpParser\Node\Expr\PropertyFetch;
use Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface;
use Rector\ReadWrite\NodeFinder\NodeUsageFinder;
final class PropertyFetchReadNodeAnalyzer implements \Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface
{
/**
* @var \Rector\ReadWrite\ReadNodeAnalyzer\JustReadExprAnalyzer
*/
private $justReadExprAnalyzer;
/**
* @var \Rector\ReadWrite\NodeFinder\NodeUsageFinder
*/
private $nodeUsageFinder;
public function __construct(\Rector\ReadWrite\ReadNodeAnalyzer\JustReadExprAnalyzer $justReadExprAnalyzer, \Rector\ReadWrite\NodeFinder\NodeUsageFinder $nodeUsageFinder)
{
$this->justReadExprAnalyzer = $justReadExprAnalyzer;
$this->nodeUsageFinder = $nodeUsageFinder;
}
public function supports(\PhpParser\Node $node) : bool
{
return $node instanceof \PhpParser\Node\Expr\PropertyFetch;
}
/**
* @param PropertyFetch $node
*/
public function isRead(\PhpParser\Node $node) : bool
{
$propertyFetchUsages = $this->nodeUsageFinder->findPropertyFetchUsages($node);
foreach ($propertyFetchUsages as $propertyFetchUsage) {
if ($this->justReadExprAnalyzer->isReadContext($propertyFetchUsage)) {
return \true;
}
}
return \false;
}
}

1
rules/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Stmt\Interface_;
use PhpParser\Node\Stmt\Property;
use PhpParser\Node\Stmt\Trait_;
use Rector\Core\NodeManipulator\PropertyManipulator;
use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Removing\NodeManipulator\ComplexNodeRemover;

149
rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php
View File

@ -1,149 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Privatization\Rector\Property;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Property;
use PHPStan\Type\ObjectType;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\VendorLocker\NodeVendorLocker\PropertyVisibilityVendorLockResolver;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @see \Rector\Tests\Privatization\Rector\Property\PrivatizeLocalPropertyToPrivatePropertyRector\PrivatizeLocalPropertyToPrivatePropertyRectorTest
*/
final class PrivatizeLocalPropertyToPrivatePropertyRector extends \Rector\Core\Rector\AbstractRector
{
/**
* @var string[]
*/
private const TAGS_REQUIRING_PUBLIC_PROPERTY = [
'api',
// Symfony DI
'required',
// Nette + other DI
'inject',
];
/**
* @var ObjectType[]
*/
private $excludedObjectTypes = [];
/**
* @var \Rector\VendorLocker\NodeVendorLocker\PropertyVisibilityVendorLockResolver
*/
private $propertyVisibilityVendorLockResolver;
/**
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
*/
private $classAnalyzer;
public function __construct(\Rector\VendorLocker\NodeVendorLocker\PropertyVisibilityVendorLockResolver $propertyVisibilityVendorLockResolver, \Rector\Core\NodeAnalyzer\ClassAnalyzer $classAnalyzer)
{
$this->propertyVisibilityVendorLockResolver = $propertyVisibilityVendorLockResolver;
$this->classAnalyzer = $classAnalyzer;
$this->excludedObjectTypes = [new \PHPStan\Type\ObjectType('PHPUnit\\Framework\\TestCase'), new \PHPStan\Type\ObjectType('PHP_CodeSniffer\\Sniffs\\Sniff')];
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Privatize local-only property to private property', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
class SomeClass
{
public $value;
public function run()
{
return $this->value;
}
}
CODE_SAMPLE
, <<<'CODE_SAMPLE'
class SomeClass
{
private $value;
public function run()
{
return $this->value;
}
}
CODE_SAMPLE
)]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Stmt\Property::class];
}
/**
* @param Property $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
if ($this->shouldSkip($node)) {
return null;
}
$propertyFetches = $this->nodeRepository->findPropertyFetchesByProperty($node);
$usedPropertyFetchClassNames = [];
foreach ($propertyFetches as $propertyFetch) {
$usedPropertyFetchClassNames[] = $propertyFetch->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
}
$usedPropertyFetchClassNames = \array_unique($usedPropertyFetchClassNames);
$propertyClassName = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
// has external usage
if ($usedPropertyFetchClassNames !== [] && [$propertyClassName] !== $usedPropertyFetchClassNames) {
return null;
}
$this->visibilityManipulator->makePrivate($node);
return $node;
}
private function shouldSkip(\PhpParser\Node\Stmt\Property $property) : bool
{
$classLike = $property->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NODE);
if (!$classLike instanceof \PhpParser\Node\Stmt\ClassLike) {
return \true;
}
if ($this->shouldSkipClass($classLike)) {
return \true;
}
if ($this->shouldSkipProperty($property)) {
return \true;
}
// is parent required property? skip it
if ($this->propertyVisibilityVendorLockResolver->isParentLockedProperty($property)) {
return \true;
}
if ($this->propertyVisibilityVendorLockResolver->isChildLockedProperty($property)) {
return \true;
}
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
return $phpDocInfo->hasByNames(self::TAGS_REQUIRING_PUBLIC_PROPERTY);
}
private function shouldSkipClass(\PhpParser\Node\Stmt\ClassLike $classLike) : bool
{
if (!$classLike instanceof \PhpParser\Node\Stmt\Class_) {
return \true;
}
if ($this->classAnalyzer->isAnonymousClass($classLike)) {
return \true;
}
if ($this->nodeTypeResolver->isObjectTypes($classLike, $this->excludedObjectTypes)) {
return \true;
}
return $classLike->isAbstract();
}
private function shouldSkipProperty(\PhpParser\Node\Stmt\Property $property) : bool
{
// already private
if ($property->isPrivate()) {
return \true;
}
// skip for now
return $property->isStatic();
}
}

10
rules/Renaming/NodeManipulator/IdentifierManipulator.php
View File

@ -30,12 +30,11 @@ final class IdentifierManipulator
$this->nodeNameResolver = $nodeNameResolver;
}
/**
* @param ClassConstFetch|MethodCall|PropertyFetch|StaticCall|ClassMethod $node
* @param string[] $renameMethodMap
* @param \PhpParser\Node\Expr\ClassConstFetch|\PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\PropertyFetch|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Stmt\ClassMethod $node
*/
public function renameNodeWithMap(\PhpParser\Node $node, array $renameMethodMap) : void
public function renameNodeWithMap($node, array $renameMethodMap) : void
{
\RectorPrefix20210627\Webmozart\Assert\Assert::isAnyOf($node, [\PhpParser\Node\Expr\ClassConstFetch::class, \PhpParser\Node\Expr\MethodCall::class, \PhpParser\Node\Expr\PropertyFetch::class, \PhpParser\Node\Expr\StaticCall::class, \PhpParser\Node\Stmt\ClassMethod::class]);
$oldNodeMethodName = $this->resolveOldMethodName($node);
if ($oldNodeMethodName === null) {
return;
@ -43,11 +42,10 @@ final class IdentifierManipulator
$node->name = new \PhpParser\Node\Identifier($renameMethodMap[$oldNodeMethodName]);
}
/**
* @param ClassConstFetch|MethodCall|PropertyFetch|StaticCall|ClassMethod $node
* @param \PhpParser\Node\Expr\ClassConstFetch|\PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\PropertyFetch|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Stmt\ClassMethod $node
*/
public function removeSuffix(\PhpParser\Node $node, string $suffixToRemove) : void
public function removeSuffix($node, string $suffixToRemove) : void
{
\RectorPrefix20210627\Webmozart\Assert\Assert::isAnyOf($node, [\PhpParser\Node\Expr\ClassConstFetch::class, \PhpParser\Node\Expr\MethodCall::class, \PhpParser\Node\Expr\PropertyFetch::class, \PhpParser\Node\Expr\StaticCall::class, \PhpParser\Node\Stmt\ClassMethod::class]);
$name = $this->nodeNameResolver->getName($node);
if ($name === null) {
return;

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '46843ec4957a00d58506bbd0593fd2f2dfc7c43f';
public const PACKAGE_VERSION = 'e3727aad8101adc655b6c7105d4e71771ef9acbf';
/**
* @var string
*/
public const RELEASE_DATE = '2021-06-27 17:21:01';
public const RELEASE_DATE = '2021-06-27 16:08:24';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210627\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf::getLoader();
return ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654::getLoader();

4
vendor/composer/autoload_classmap.php vendored
View File

@ -2405,7 +2405,6 @@ return array(
'Rector\\NodeCollector\\NodeAnalyzer\\BooleanAndAnalyzer' => $baseDir . '/packages/NodeCollector/NodeAnalyzer/BooleanAndAnalyzer.php',
'Rector\\NodeCollector\\NodeCollector\\NodeRepository' => $baseDir . '/packages/NodeCollector/NodeCollector/NodeRepository.php',
'Rector\\NodeCollector\\NodeCollector\\ParsedNodeCollector' => $baseDir . '/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php',
'Rector\\NodeCollector\\NodeCollector\\ParsedPropertyFetchNodeCollector' => $baseDir . '/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php',
'Rector\\NodeCollector\\NodeVisitor\\NodeCollectorNodeVisitor' => $baseDir . '/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php',
'Rector\\NodeCollector\\ScopeResolver\\ParentClassScopeResolver' => $baseDir . '/packages/NodeCollector/ScopeResolver/ParentClassScopeResolver.php',
'Rector\\NodeCollector\\StaticAnalyzer' => $baseDir . '/packages/NodeCollector/StaticAnalyzer.php',
@ -2811,7 +2810,6 @@ return array(
'Rector\\Privatization\\Rector\\MethodCall\\ReplaceStringWithClassConstantRector' => $baseDir . '/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php',
'Rector\\Privatization\\Rector\\Property\\ChangeReadOnlyPropertyWithDefaultValueToConstantRector' => $baseDir . '/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php',
'Rector\\Privatization\\Rector\\Property\\PrivatizeFinalClassPropertyRector' => $baseDir . '/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php',
'Rector\\Privatization\\Rector\\Property\\PrivatizeLocalPropertyToPrivatePropertyRector' => $baseDir . '/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php',
'Rector\\Privatization\\Reflection\\ClassConstantsResolver' => $baseDir . '/rules/Privatization/Reflection/ClassConstantsResolver.php',
'Rector\\Privatization\\TypeManipulator\\NormalizeTypeToRespectArrayScalarType' => $baseDir . '/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php',
'Rector\\Privatization\\ValueObject\\ConstantVisibility' => $baseDir . '/rules/Privatization/ValueObject/ConstantVisibility.php',
@ -2823,7 +2821,7 @@ return array(
'Rector\\ReadWrite\\NodeAnalyzer\\ReadWritePropertyAnalyzer' => $baseDir . '/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php',
'Rector\\ReadWrite\\NodeFinder\\NodeUsageFinder' => $baseDir . '/packages/ReadWrite/NodeFinder/NodeUsageFinder.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\JustReadExprAnalyzer' => $baseDir . '/packages/ReadWrite/ReadNodeAnalyzer/JustReadExprAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\PropertyFetchReadNodeAnalyzer' => $baseDir . '/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\LocalPropertyFetchReadNodeAnalyzer' => $baseDir . '/packages/ReadWrite/ReadNodeAnalyzer/LocalPropertyFetchReadNodeAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\VariableReadNodeAnalyzer' => $baseDir . '/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php',
'Rector\\RectorInstaller\\Filesystem' => $vendorDir . '/rector/extension-installer/src/Filesystem.php',
'Rector\\RectorInstaller\\GeneratedConfig' => $vendorDir . '/rector/extension-installer/src/GeneratedConfig.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf
class ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree0a0f2ad3d4ab2e96729a38a2da4cbdf($fileIdentifier, $file);
composerRequireb980ab87789b3e5a1b003eaec1ea1654($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiree0a0f2ad3d4ab2e96729a38a2da4cbdf($fileIdentifier, $file)
function composerRequireb980ab87789b3e5a1b003eaec1ea1654($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

12
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf
class ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2755,7 +2755,6 @@ class ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf
'Rector\\NodeCollector\\NodeAnalyzer\\BooleanAndAnalyzer' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeAnalyzer/BooleanAndAnalyzer.php',
'Rector\\NodeCollector\\NodeCollector\\NodeRepository' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeCollector/NodeRepository.php',
'Rector\\NodeCollector\\NodeCollector\\ParsedNodeCollector' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeCollector/ParsedNodeCollector.php',
'Rector\\NodeCollector\\NodeCollector\\ParsedPropertyFetchNodeCollector' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeCollector/ParsedPropertyFetchNodeCollector.php',
'Rector\\NodeCollector\\NodeVisitor\\NodeCollectorNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php',
'Rector\\NodeCollector\\ScopeResolver\\ParentClassScopeResolver' => __DIR__ . '/../..' . '/packages/NodeCollector/ScopeResolver/ParentClassScopeResolver.php',
'Rector\\NodeCollector\\StaticAnalyzer' => __DIR__ . '/../..' . '/packages/NodeCollector/StaticAnalyzer.php',
@ -3161,7 +3160,6 @@ class ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf
'Rector\\Privatization\\Rector\\MethodCall\\ReplaceStringWithClassConstantRector' => __DIR__ . '/../..' . '/rules/Privatization/Rector/MethodCall/ReplaceStringWithClassConstantRector.php',
'Rector\\Privatization\\Rector\\Property\\ChangeReadOnlyPropertyWithDefaultValueToConstantRector' => __DIR__ . '/../..' . '/rules/Privatization/Rector/Property/ChangeReadOnlyPropertyWithDefaultValueToConstantRector.php',
'Rector\\Privatization\\Rector\\Property\\PrivatizeFinalClassPropertyRector' => __DIR__ . '/../..' . '/rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php',
'Rector\\Privatization\\Rector\\Property\\PrivatizeLocalPropertyToPrivatePropertyRector' => __DIR__ . '/../..' . '/rules/Privatization/Rector/Property/PrivatizeLocalPropertyToPrivatePropertyRector.php',
'Rector\\Privatization\\Reflection\\ClassConstantsResolver' => __DIR__ . '/../..' . '/rules/Privatization/Reflection/ClassConstantsResolver.php',
'Rector\\Privatization\\TypeManipulator\\NormalizeTypeToRespectArrayScalarType' => __DIR__ . '/../..' . '/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php',
'Rector\\Privatization\\ValueObject\\ConstantVisibility' => __DIR__ . '/../..' . '/rules/Privatization/ValueObject/ConstantVisibility.php',
@ -3173,7 +3171,7 @@ class ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf
'Rector\\ReadWrite\\NodeAnalyzer\\ReadWritePropertyAnalyzer' => __DIR__ . '/../..' . '/packages/ReadWrite/NodeAnalyzer/ReadWritePropertyAnalyzer.php',
'Rector\\ReadWrite\\NodeFinder\\NodeUsageFinder' => __DIR__ . '/../..' . '/packages/ReadWrite/NodeFinder/NodeUsageFinder.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\JustReadExprAnalyzer' => __DIR__ . '/../..' . '/packages/ReadWrite/ReadNodeAnalyzer/JustReadExprAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\PropertyFetchReadNodeAnalyzer' => __DIR__ . '/../..' . '/packages/ReadWrite/ReadNodeAnalyzer/PropertyFetchReadNodeAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\LocalPropertyFetchReadNodeAnalyzer' => __DIR__ . '/../..' . '/packages/ReadWrite/ReadNodeAnalyzer/LocalPropertyFetchReadNodeAnalyzer.php',
'Rector\\ReadWrite\\ReadNodeAnalyzer\\VariableReadNodeAnalyzer' => __DIR__ . '/../..' . '/packages/ReadWrite/ReadNodeAnalyzer/VariableReadNodeAnalyzer.php',
'Rector\\RectorInstaller\\Filesystem' => __DIR__ . '/..' . '/rector/extension-installer/src/Filesystem.php',
'Rector\\RectorInstaller\\GeneratedConfig' => __DIR__ . '/..' . '/rector/extension-installer/src/GeneratedConfig.php',
@ -3834,9 +3832,9 @@ class ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite0a0f2ad3d4ab2e96729a38a2da4cbdf::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb980ab87789b3e5a1b003eaec1ea1654::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210627\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf', false) && !interface_exists('ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf', false) && !trait_exists('ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf', false)) {
spl_autoload_call('RectorPrefix20210627\ComposerAutoloaderInite0a0f2ad3d4ab2e96729a38a2da4cbdf');
if (!class_exists('ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654', false) && !interface_exists('ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654', false) && !trait_exists('ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654', false)) {
spl_autoload_call('RectorPrefix20210627\ComposerAutoloaderInitb980ab87789b3e5a1b003eaec1ea1654');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210627\Doctrine\Inflector\Inflector');
@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210627\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiree0a0f2ad3d4ab2e96729a38a2da4cbdf')) {
function composerRequiree0a0f2ad3d4ab2e96729a38a2da4cbdf() {
return \RectorPrefix20210627\composerRequiree0a0f2ad3d4ab2e96729a38a2da4cbdf(...func_get_args());
if (!function_exists('composerRequireb980ab87789b3e5a1b003eaec1ea1654')) {
function composerRequireb980ab87789b3e5a1b003eaec1ea1654() {
return \RectorPrefix20210627\composerRequireb980ab87789b3e5a1b003eaec1ea1654(...func_get_args());
}
}
if (!function_exists('parseArgs')) {