2525use ShipMonk \PHPStan \DeadCode \Graph \ClassMethodRef ;
2626use ShipMonk \PHPStan \DeadCode \Graph \ClassMethodUsage ;
2727use ShipMonk \PHPStan \DeadCode \Graph \CollectedUsage ;
28- use ShipMonk \PHPStan \DeadCode \Graph \UsageOriginDetector ;
28+ use ShipMonk \PHPStan \DeadCode \Graph \UsageOrigin ;
2929
3030/**
3131 * @implements Collector<Node, list<string>>
@@ -35,8 +35,6 @@ class MethodCallCollector implements Collector
3535
3636 use BufferedUsageCollector;
3737
38- private UsageOriginDetector $ usageOriginDetector ;
39-
4038 private bool $ trackMixedAccess ;
4139
4240 /**
@@ -48,12 +46,10 @@ class MethodCallCollector implements Collector
4846 * @param list<MemberUsageExcluder> $memberUsageExcluders
4947 */
5048 public function __construct (
51- UsageOriginDetector $ usageOriginDetector ,
5249 bool $ trackMixedAccess ,
5350 array $ memberUsageExcluders
5451 )
5552 {
56- $ this ->usageOriginDetector = $ usageOriginDetector ;
5753 $ this ->trackMixedAccess = $ trackMixedAccess ;
5854 $ this ->memberUsageExcluders = $ memberUsageExcluders ;
5955 }
@@ -133,7 +129,7 @@ private function registerMethodCall(
133129 foreach ($ this ->getDeclaringTypesWithMethod ($ methodName , $ callerType , TrinaryLogic::createNo (), $ possibleDescendantCall ) as $ methodRef ) {
134130 $ this ->registerUsage (
135131 new ClassMethodUsage (
136- $ this -> usageOriginDetector -> detectOrigin ( $ scope ),
132+ UsageOrigin:: createRegular ( $ methodCall , $ scope ),
137133 $ methodRef ,
138134 ),
139135 $ methodCall ,
@@ -163,7 +159,7 @@ private function registerStaticCall(
163159 foreach ($ this ->getDeclaringTypesWithMethod ($ methodName , $ callerType , TrinaryLogic::createYes (), $ possibleDescendantCall ) as $ methodRef ) {
164160 $ this ->registerUsage (
165161 new ClassMethodUsage (
166- $ this -> usageOriginDetector -> detectOrigin ( $ scope ),
162+ UsageOrigin:: createRegular ( $ staticCall , $ scope ),
167163 $ methodRef ,
168164 ),
169165 $ staticCall ,
@@ -189,7 +185,7 @@ private function registerArrayCallable(
189185 foreach ($ this ->getDeclaringTypesWithMethod ($ methodName , $ caller , TrinaryLogic::createMaybe ()) as $ methodRef ) {
190186 $ this ->registerUsage (
191187 new ClassMethodUsage (
192- $ this -> usageOriginDetector -> detectOrigin ( $ scope ),
188+ UsageOrigin:: createRegular ( $ array , $ scope ),
193189 $ methodRef ,
194190 ),
195191 $ array ,
@@ -205,7 +201,7 @@ private function registerAttribute(Attribute $node, Scope $scope): void
205201 {
206202 $ this ->registerUsage (
207203 new ClassMethodUsage (
208- null ,
204+ UsageOrigin:: createRegular ( $ node , $ scope ) ,
209205 new ClassMethodRef ($ scope ->resolveName ($ node ->name ), '__construct ' , false ),
210206 ),
211207 $ node ,
@@ -221,7 +217,7 @@ private function registerClone(Clone_ $node, Scope $scope): void
221217 foreach ($ this ->getDeclaringTypesWithMethod ($ methodName , $ callerType , TrinaryLogic::createNo ()) as $ methodRef ) {
222218 $ this ->registerUsage (
223219 new ClassMethodUsage (
224- $ this -> usageOriginDetector -> detectOrigin ( $ scope ),
220+ UsageOrigin:: createRegular ( $ node , $ scope ),
225221 $ methodRef ,
226222 ),
227223 $ node ,
0 commit comments