Skip to content

Commit f0db387

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit b91f35ff6e833e2abb6591044309984549f0b539
rectorphp/rector-src@b91f35f Fix FinalizeClassesWithoutChildrenRector for changed class, use more reliable reflection to detect Doctrine attributes (#3276)
1 parent 4372e75 commit f0db387

7 files changed

Lines changed: 76 additions & 48 deletions

File tree

‎rules/Privatization/Rector/Class_/FinalizeClassesWithoutChildrenRector.php‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
namespace Rector\Privatization\Rector\Class_;
55

66
use PhpParser\Node;
7-
use PhpParser\Node\Name\FullyQualified;
87
use PhpParser\Node\Stmt\Class_;
98
use PHPStan\Reflection\ClassReflection;
109
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
10+
use Rector\Core\NodeAnalyzer\DoctrineEntityAnalyzer;
1111
use Rector\Core\Rector\AbstractRector;
1212
use Rector\Core\Reflection\ReflectionResolver;
1313
use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
@@ -19,14 +19,6 @@
1919
*/
2020
final class FinalizeClassesWithoutChildrenRector extends AbstractRector
2121
{
22-
/**
23-
* @var string[]
24-
*/
25-
private const DOCTRINE_ORM_MAPPING_ANNOTATION = ['Doctrine\\ORM\\Mapping\\Entity', 'Doctrine\\ORM\\Mapping\\Embeddable'];
26-
/**
27-
* @var string[]
28-
*/
29-
private const DOCTRINE_ODM_MAPPING_ANNOTATION = ['Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\Document', 'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\EmbeddedDocument'];
3022
/**
3123
* @readonly
3224
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
@@ -47,12 +39,18 @@ final class FinalizeClassesWithoutChildrenRector extends AbstractRector
4739
* @var \Rector\Core\Reflection\ReflectionResolver
4840
*/
4941
private $reflectionResolver;
50-
public function __construct(ClassAnalyzer $classAnalyzer, FamilyRelationsAnalyzer $familyRelationsAnalyzer, VisibilityManipulator $visibilityManipulator, ReflectionResolver $reflectionResolver)
42+
/**
43+
* @readonly
44+
* @var \Rector\Core\NodeAnalyzer\DoctrineEntityAnalyzer
45+
*/
46+
private $doctrineEntityAnalyzer;
47+
public function __construct(ClassAnalyzer $classAnalyzer, FamilyRelationsAnalyzer $familyRelationsAnalyzer, VisibilityManipulator $visibilityManipulator, ReflectionResolver $reflectionResolver, DoctrineEntityAnalyzer $doctrineEntityAnalyzer)
5148
{
5249
$this->classAnalyzer = $classAnalyzer;
5350
$this->familyRelationsAnalyzer = $familyRelationsAnalyzer;
5451
$this->visibilityManipulator = $visibilityManipulator;
5552
$this->reflectionResolver = $reflectionResolver;
53+
$this->doctrineEntityAnalyzer = $doctrineEntityAnalyzer;
5654
}
5755
public function getRuleDefinition() : RuleDefinition
5856
{
@@ -99,45 +97,23 @@ public function refactor(Node $node) : ?Node
9997
if ($this->shouldSkipClass($node)) {
10098
return null;
10199
}
102-
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
103-
if ($phpDocInfo->hasByAnnotationClasses(self::DOCTRINE_ORM_MAPPING_ANNOTATION)) {
104-
return null;
105-
}
106-
if ($phpDocInfo->hasByAnnotationClasses(self::DOCTRINE_ODM_MAPPING_ANNOTATION)) {
100+
if ($this->doctrineEntityAnalyzer->hasClassAnnotation($node)) {
107101
return null;
108102
}
109103
$classReflection = $this->reflectionResolver->resolveClassReflection($node);
110104
if (!$classReflection instanceof ClassReflection) {
111105
return null;
112106
}
113-
$childrenClassReflections = $this->familyRelationsAnalyzer->getChildrenOfClassReflection($classReflection);
114-
if ($childrenClassReflections !== []) {
107+
if ($this->doctrineEntityAnalyzer->hasClassReflectionAttribute($classReflection)) {
115108
return null;
116109
}
117-
if ($this->hasDoctrineAttr($node)) {
110+
$childrenClassReflections = $this->familyRelationsAnalyzer->getChildrenOfClassReflection($classReflection);
111+
if ($childrenClassReflections !== []) {
118112
return null;
119113
}
120114
$this->visibilityManipulator->makeFinal($node);
121115
return $node;
122116
}
123-
private function hasDoctrineAttr(Class_ $class) : bool
124-
{
125-
foreach ($class->attrGroups as $attrGroup) {
126-
foreach ($attrGroup->attrs as $attribute) {
127-
if (!$attribute->name instanceof FullyQualified) {
128-
continue;
129-
}
130-
$className = $this->nodeNameResolver->getName($attribute->name);
131-
if (\in_array($className, self::DOCTRINE_ORM_MAPPING_ANNOTATION, \true)) {
132-
return \true;
133-
}
134-
if (\in_array($className, self::DOCTRINE_ODM_MAPPING_ANNOTATION, \true)) {
135-
return \true;
136-
}
137-
}
138-
}
139-
return \false;
140-
}
141117
private function shouldSkipClass(Class_ $class) : bool
142118
{
143119
if ($class->isFinal()) {

‎src/Application/VersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = 'fbf9506c5de7389260e8a842c911b3315b053df3';
22+
public const PACKAGE_VERSION = 'b91f35ff6e833e2abb6591044309984549f0b539';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-01-13 15:10:38';
27+
public const RELEASE_DATE = '2023-01-13 15:32:52';
2828
/**
2929
* @var int
3030
*/

‎src/NodeAnalyzer/DoctrineEntityAnalyzer.php‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace Rector\Core\NodeAnalyzer;
5+
6+
use PhpParser\Node\Stmt\Class_;
7+
use PHPStan\BetterReflection\Reflection\Adapter\ReflectionClass;
8+
use PHPStan\Reflection\ClassReflection;
9+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
10+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
11+
final class DoctrineEntityAnalyzer
12+
{
13+
/**
14+
* @var string[]
15+
*/
16+
private const DOCTRINE_MAPPING_CLASSES = ['Doctrine\\ORM\\Mapping\\Entity', 'Doctrine\\ORM\\Mapping\\Embeddable', 'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\Document', 'Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\EmbeddedDocument'];
17+
/**
18+
* @readonly
19+
* @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
20+
*/
21+
private $phpDocInfoFactory;
22+
public function __construct(PhpDocInfoFactory $phpDocInfoFactory)
23+
{
24+
$this->phpDocInfoFactory = $phpDocInfoFactory;
25+
}
26+
public function hasClassAnnotation(Class_ $class) : bool
27+
{
28+
$phpDocInfo = $this->phpDocInfoFactory->createFromNode($class);
29+
if (!$phpDocInfo instanceof PhpDocInfo) {
30+
return \false;
31+
}
32+
return $phpDocInfo->hasByAnnotationClasses(self::DOCTRINE_MAPPING_CLASSES);
33+
}
34+
public function hasClassReflectionAttribute(ClassReflection $classReflection) : bool
35+
{
36+
/** @var ReflectionClass $nativeReflectionClass */
37+
$nativeReflectionClass = $classReflection->getNativeReflection();
38+
// skip early in case of no attributes at all
39+
if ((\method_exists($nativeReflectionClass, 'getAttributes') ? $nativeReflectionClass->getAttributes() : []) === []) {
40+
return \false;
41+
}
42+
foreach (self::DOCTRINE_MAPPING_CLASSES as $doctrineMappingClass) {
43+
// skip entities
44+
if ((\method_exists($nativeReflectionClass, 'getAttributes') ? $nativeReflectionClass->getAttributes($doctrineMappingClass) : []) !== []) {
45+
return \true;
46+
}
47+
}
48+
return \false;
49+
}
50+
}

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInitd2d59cdc3af9e2a300f86669d6294375::getLoader();
25+
return ComposerAutoloaderInitb28dbaf8f7232df85b184294fd29ad82::getLoader();

‎vendor/composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,6 +1418,7 @@
14181418
'Rector\\Core\\NodeAnalyzer\\CoalesceAnalyzer' => $baseDir . '/src/NodeAnalyzer/CoalesceAnalyzer.php',
14191419
'Rector\\Core\\NodeAnalyzer\\CompactFuncCallAnalyzer' => $baseDir . '/src/NodeAnalyzer/CompactFuncCallAnalyzer.php',
14201420
'Rector\\Core\\NodeAnalyzer\\ConstFetchAnalyzer' => $baseDir . '/src/NodeAnalyzer/ConstFetchAnalyzer.php',
1421+
'Rector\\Core\\NodeAnalyzer\\DoctrineEntityAnalyzer' => $baseDir . '/src/NodeAnalyzer/DoctrineEntityAnalyzer.php',
14211422
'Rector\\Core\\NodeAnalyzer\\EnumAnalyzer' => $baseDir . '/src/NodeAnalyzer/EnumAnalyzer.php',
14221423
'Rector\\Core\\NodeAnalyzer\\ExprAnalyzer' => $baseDir . '/src/NodeAnalyzer/ExprAnalyzer.php',
14231424
'Rector\\Core\\NodeAnalyzer\\InlineHTMLAnalyzer' => $baseDir . '/src/NodeAnalyzer/InlineHTMLAnalyzer.php',

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInitd2d59cdc3af9e2a300f86669d6294375
5+
class ComposerAutoloaderInitb28dbaf8f7232df85b184294fd29ad82
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInitd2d59cdc3af9e2a300f86669d6294375', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInitb28dbaf8f7232df85b184294fd29ad82', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInitd2d59cdc3af9e2a300f86669d6294375', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInitb28dbaf8f7232df85b184294fd29ad82', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82::$files;
3636
$requireFile = static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375
7+
class ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -1663,6 +1663,7 @@ class ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375
16631663
'Rector\\Core\\NodeAnalyzer\\CoalesceAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/CoalesceAnalyzer.php',
16641664
'Rector\\Core\\NodeAnalyzer\\CompactFuncCallAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/CompactFuncCallAnalyzer.php',
16651665
'Rector\\Core\\NodeAnalyzer\\ConstFetchAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ConstFetchAnalyzer.php',
1666+
'Rector\\Core\\NodeAnalyzer\\DoctrineEntityAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/DoctrineEntityAnalyzer.php',
16661667
'Rector\\Core\\NodeAnalyzer\\EnumAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/EnumAnalyzer.php',
16671668
'Rector\\Core\\NodeAnalyzer\\ExprAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ExprAnalyzer.php',
16681669
'Rector\\Core\\NodeAnalyzer\\InlineHTMLAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/InlineHTMLAnalyzer.php',
@@ -3064,9 +3065,9 @@ class ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375
30643065
public static function getInitializer(ClassLoader $loader)
30653066
{
30663067
return \Closure::bind(function () use ($loader) {
3067-
$loader->prefixLengthsPsr4 = ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375::$prefixLengthsPsr4;
3068-
$loader->prefixDirsPsr4 = ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375::$prefixDirsPsr4;
3069-
$loader->classMap = ComposerStaticInitd2d59cdc3af9e2a300f86669d6294375::$classMap;
3068+
$loader->prefixLengthsPsr4 = ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82::$prefixLengthsPsr4;
3069+
$loader->prefixDirsPsr4 = ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82::$prefixDirsPsr4;
3070+
$loader->classMap = ComposerStaticInitb28dbaf8f7232df85b184294fd29ad82::$classMap;
30703071

30713072
}, null, ClassLoader::class);
30723073
}

0 commit comments

Comments
 (0)