66use PhpParser \Node ;
77use PhpParser \Node \Expr \Assign ;
88use PhpParser \Node \Stmt \Class_ ;
9- use PhpParser \Node \Stmt \ClassLike ;
109use PhpParser \Node \Stmt \ClassMethod ;
1110use PhpParser \Node \Stmt \Function_ ;
1211use PhpParser \Node \Stmt \Property ;
1312use PhpParser \NodeTraverser ;
1413use Rector \Core \NodeAnalyzer \PropertyFetchAnalyzer ;
15- use Rector \Core \PhpParser \Node \BetterNodeFinder ;
1614use Rector \Core \ValueObject \MethodName ;
1715use Rector \NodeNameResolver \NodeNameResolver ;
1816use Rector \PhpDocParser \NodeTraverser \SimpleCallableNodeTraverser ;
@@ -28,30 +26,20 @@ final class PropertyFetchAssignManipulator
2826 * @var \Rector\NodeNameResolver\NodeNameResolver
2927 */
3028 private $ nodeNameResolver ;
31- /**
32- * @readonly
33- * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
34- */
35- private $ betterNodeFinder ;
3629 /**
3730 * @readonly
3831 * @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
3932 */
4033 private $ propertyFetchAnalyzer ;
41- public function __construct (SimpleCallableNodeTraverser $ simpleCallableNodeTraverser , NodeNameResolver $ nodeNameResolver , BetterNodeFinder $ betterNodeFinder , PropertyFetchAnalyzer $ propertyFetchAnalyzer )
34+ public function __construct (SimpleCallableNodeTraverser $ simpleCallableNodeTraverser , NodeNameResolver $ nodeNameResolver , PropertyFetchAnalyzer $ propertyFetchAnalyzer )
4235 {
4336 $ this ->simpleCallableNodeTraverser = $ simpleCallableNodeTraverser ;
4437 $ this ->nodeNameResolver = $ nodeNameResolver ;
45- $ this ->betterNodeFinder = $ betterNodeFinder ;
4638 $ this ->propertyFetchAnalyzer = $ propertyFetchAnalyzer ;
4739 }
48- public function isAssignedMultipleTimesInConstructor (Property $ property ) : bool
40+ public function isAssignedMultipleTimesInConstructor (Class_ $ class , Property $ property ) : bool
4941 {
50- $ classLike = $ this ->betterNodeFinder ->findParentType ($ property , ClassLike::class);
51- if (!$ classLike instanceof ClassLike) {
52- return \false;
53- }
54- $ classMethod = $ classLike ->getMethod (MethodName::CONSTRUCT );
42+ $ classMethod = $ class ->getMethod (MethodName::CONSTRUCT );
5543 if (!$ classMethod instanceof ClassMethod) {
5644 return \false;
5745 }
0 commit comments