diff --git a/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php b/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php index 094840a7ac2..11e105efcde 100644 --- a/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php +++ b/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php @@ -137,24 +137,16 @@ final class NamedServicesToConstructorNodeVisitor extends NodeVisitorAbstract return true; } - /** - * @param MethodCall|Expr $methodCallNode - */ - private function resolveServiceTypeFromMethodCall($methodCallNode): ?string - { - /** @var String_ $argument */ - $argument = $methodCallNode->args[0]->value; - $serviceName = $argument->value; - - return $this->serviceFromKernelResolver->resolveServiceClassByNameFromKernel( - $serviceName, LocalKernel::class - ); - } - private function processMethodCallNode(Class_ $classNode, MethodCall $methodCall): ?PropertyFetch { - // Get service type - $serviceType = $this->resolveServiceTypeFromMethodCall($methodCall); + /** @var String_ $argument */ + $argument = $methodCall->args[0]->value; + $serviceName = $argument->value; + + $serviceType = $this->serviceFromKernelResolver->resolveServiceClassByNameFromKernel( + $serviceName, LocalKernel::class + ); + if ($serviceType === null) { return null; } diff --git a/src/NodeVisitor/DependencyInjection/NamedServicesToConstrutor/GetterToPropertyNodeVisitor.php b/src/NodeVisitor/DependencyInjection/NamedServicesToConstrutor/GetterToPropertyNodeVisitor.php index 058299ba1fa..813c165107d 100644 --- a/src/NodeVisitor/DependencyInjection/NamedServicesToConstrutor/GetterToPropertyNodeVisitor.php +++ b/src/NodeVisitor/DependencyInjection/NamedServicesToConstrutor/GetterToPropertyNodeVisitor.php @@ -124,27 +124,15 @@ final class GetterToPropertyNodeVisitor extends NodeVisitorAbstract return true; } - /** - * @param MethodCall|Expr $methodCallNode - */ - private function resolveServiceTypeFromMethodCall($methodCallNode): ?string - { - /** @var String_ $argument */ - $argument = $methodCallNode->args[0]->value; - $serviceName = $argument->value; - - return $this->serviceFromKernelResolver->resolveServiceClassByNameFromKernel( - $serviceName, LocalKernel::class - ); - } - private function processMethodCallNode(MethodCall $methodCall): ?PropertyFetch { - // Get service type - $serviceType = $this->resolveServiceTypeFromMethodCall($methodCall); - if ($serviceType === null) { - return null; - } + /** @var String_ $argument */ + $argument = $methodCall->args[0]->value; + $serviceName = $argument->value; + + $serviceType = $this->serviceFromKernelResolver->resolveServiceClassByNameFromKernel( + $serviceName, LocalKernel::class + ); // Get property name $propertyName = $this->nameResolver->resolvePropertyNameFromType($serviceType);