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

[Privatization] Remove MakeUnusedClassesWithChildrenAbstractRector as risky and full context is needed (#6091)

Browse Source
This commit is contained in:
Tomas Votruba 2021-04-10 20:18:49 +02:00 committed by GitHub
parent 7aecf8138d
commit 26a5b86892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 513 additions and 637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/set/privatization.php
View File

@ -5,7 +5,6 @@ declare(strict_types=1);
use Rector\Privatization\Rector\Class_\ChangeLocalPropertyToVariableRector;
use Rector\Privatization\Rector\Class_\ChangeReadOnlyVariableWithDefaultValueToConstantRector;
use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
use Rector\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector;
use Rector\Privatization\Rector\Class_\RepeatedLiteralToClassConstantRector;
use Rector\Privatization\Rector\ClassMethod\ChangeGlobalVariablesToPropertiesRector;
use Rector\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector;
@ -18,7 +17,6 @@ use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigura
return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(MakeUnusedClassesWithChildrenAbstractRector::class);
$services->set(FinalizeClassesWithoutChildrenRector::class);
$services->set(ChangeGlobalVariablesToPropertiesRector::class);
$services->set(ChangeReadOnlyPropertyWithDefaultValueToConstantRector::class);

903
docs/rector_rules_overview.md
View File

File diff suppressed because it is too large Load Diff

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

@ -511,14 +511,6 @@ final class NodeRepository
return $this->parsedNodeCollector->getClasses();
}
/**
* @return New_[]
*/
public function findNewsByClass(string $className): array
{
return $this->parsedNodeCollector->findNewsByClass($className);
}
public function findClassConstant(string $className, string $constantName): ?ClassConst
{
return $this->parsedNodeCollector->findClassConstant($className, $constantName);

18
packages/NodeCollector/NodeCollector/ParsedNodeCollector.php
View File

@ -213,24 +213,6 @@ final class ParsedNodeCollector
}
}
/**
* @return New_[]
*/
public function findNewsByClass(string $className): array
{
$newsByClass = [];
foreach ($this->news as $new) {
if (! $this->nodeNameResolver->isName($new->class, $className)) {
continue;
}
$newsByClass[] = $new;
}
return $newsByClass;
}
public function findClassConstByClassConstFetch(ClassConstFetch $classConstFetch): ?ClassConst
{
$className = $this->nodeNameResolver->getName($classConstFetch->class);

27
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/Fixture/fixture.php.inc
View File

@ -1,27 +0,0 @@
<?php
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\Fixture;
class SomeClass extends PossibleAbstractClass
{
}
class PossibleAbstractClass
{
}
?>
-----
<?php
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\Fixture;
class SomeClass extends PossibleAbstractClass
{
}
abstract class PossibleAbstractClass
{
}
?>

26
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/Fixture/skip_method_call.php.inc
View File

@ -1,26 +0,0 @@
<?php
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\Fixture;
class SkipMethodCall
{
public static function run()
{
}
}
class ClassCalling
{
public function go($skipMethodCall)
{
/** @var SkipMethodCall $skipMethodCall */
$skipMethodCall->run();
}
}
function localFunction()
{
// just so the ClassCalling is not made abstract
$classCalling = new ClassCalling();
}

12
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/Fixture/skip_new.php.inc
View File

@ -1,12 +0,0 @@
<?php
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\Fixture;
class SkipNew
{
}
function runMePlease()
{
return new SkipNew();
}

16
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/Fixture/skip_static_call.php.inc
View File

@ -1,16 +0,0 @@
<?php
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\Fixture;
class SkipStaticCall
{
public static function run()
{
}
}
function run()
{
SkipStaticCall::run();
}

33
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/MakeUnusedClassesWithChildrenAbstractRectorTest.php
View File

@ -1,33 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector;
use Iterator;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
use Symplify\SmartFileSystem\SmartFileInfo;
final class MakeUnusedClassesWithChildrenAbstractRectorTest extends AbstractRectorTestCase
{
/**
* @dataProvider provideData()
*/
public function test(SmartFileInfo $fileInfo): void
{
$this->doTestFileInfo($fileInfo);
}
/**
* @return Iterator<SmartFileInfo>
*/
public function provideData(): Iterator
{
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
}
public function provideConfigFilePath(): string
{
return __DIR__ . '/config/configured_rule.php';
}
}

12
rules-tests/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector/config/configured_rule.php
View File

@ -1,12 +0,0 @@
<?php
declare(strict_types=1);
use Rector\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(MakeUnusedClassesWithChildrenAbstractRector::class);
};

92
rules/Privatization/Rector/Class_/MakeUnusedClassesWithChildrenAbstractRector.php
View File

@ -1,92 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\Privatization\Rector\Class_;
use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @see \Rector\Tests\Privatization\Rector\Class_\MakeUnusedClassesWithChildrenAbstractRector\MakeUnusedClassesWithChildrenAbstractRectorTest
*/
final class MakeUnusedClassesWithChildrenAbstractRector extends AbstractRector
{
public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
'Classes that have no children nor are used, should have abstract',
[
new CodeSample(
<<<'CODE_SAMPLE'
class SomeClass extends PossibleAbstractClass
{
}
class PossibleAbstractClass
{
}
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
class SomeClass extends PossibleAbstractClass
{
}
abstract class PossibleAbstractClass
{
}
CODE_SAMPLE
),
]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes(): array
{
return [Class_::class];
}
/**
* @param Class_ $node
*/
public function refactor(Node $node): ?Node
{
$className = $this->getName($node);
if ($className === null) {
return null;
}
$nodeRepositoryFindMethodCallsOnClass = $this->nodeRepository->findMethodCallsOnClass($className);
// 1. is in static call?
if ($nodeRepositoryFindMethodCallsOnClass !== []) {
return null;
}
$parsedNodeCollectorFindNewsByClass = $this->nodeRepository->findNewsByClass($className);
// 2. is in new?
if ($parsedNodeCollectorFindNewsByClass !== []) {
return null;
}
$nodeRepositoryFindChildrenOfClass = $this->nodeRepository->findChildrenOfClass($className);
// 3. does it have any children
if ($nodeRepositoryFindChildrenOfClass === []) {
return null;
}
// is abstract!
if ($node->isAbstract()) {
return null;
}
$this->visibilityManipulator->makeAbstract($node);
return $node;
}
}

1
rules/RemovingStatic/Rector/ClassMethod/LocallyCalledStaticMethodToNonStaticRector.php
View File

@ -101,6 +101,7 @@ CODE_SAMPLE
}
$scope = $classMethod->getAttribute(AttributeKey::SCOPE);
$classReflection = $scope->getClassReflection();
if (! $classReflection instanceof ClassReflection) {
return null;