From 6f460a750db555bf0ce4689a781da18a4c61c788 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Thu, 13 Jun 2024 18:31:54 +0300 Subject: [PATCH] updated Inject detection Signed-off-by: alexmerlin --- di-converter.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/di-converter.php b/di-converter.php index 68f56b1..08b3e13 100644 --- a/di-converter.php +++ b/di-converter.php @@ -230,17 +230,17 @@ * Replace @Inject(dependencies) with #[Inject(dependencies)] in all classes */ if (str_contains($after, '@Inject({')) { - preg_match('#/\*\*\n\s*\*\s*@Inject[\s\S\n]*?\*/#', $after, $injectTag); + preg_match('#/\**\n*\s*\**\s*@Inject[\s\S\n]*?\*/#', $after, $injectTag); if (isset($injectTag[0])) { $injectTag = $injectTag[0]; - preg_match_all('/^\s*\*\s*(\b\w*\b::class,*|"[a-zA-Z0-9-._]*",*)$/m', $injectTag, $oldDependencies); + preg_match_all('/[^,\s{]+::class|".+?"/m', $injectTag, $oldDependencies); $newDependencies = []; - if (isset($oldDependencies[1])) { + if (! empty($oldDependencies[0])) { $newDependencies[] = '#[Inject('; - foreach ($oldDependencies[1] as $dependency) { + foreach ($oldDependencies[0] as $dependency) { if (! str_ends_with($dependency, ',')) { $dependency .= ','; }