[DependencyInjection]: Added type to @method declaration, move values…

… to constants
fractalzombie · Aug 15, 2022 · 399d6cb · 399d6cb
1 parent ad264d4
commit 399d6cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Compiler/AbstractRegisterAttributePass.php b/Compiler/AbstractRegisterAttributePass.php
@@ -25,7 +25,7 @@
  *
  * @author Mykhailo Shtanko <fractalzombie@gmail.com>
  *
- * @method register(ContainerBuilder $container, \ReflectionClass $reflectionClass, \Attribute $attribute): void
+ * @method void register(ContainerBuilder $container, \ReflectionClass $reflectionClass, \Attribute $attribute)
  */
 abstract class AbstractRegisterAttributePass implements CompilerPassInterface
 {

diff --git a/Helper/DefinitionHelper.php b/Helper/DefinitionHelper.php
@@ -14,6 +14,9 @@
 #[Immutable]
 final class DefinitionHelper
 {
+    private const SERVICE_PREFIX = '@';
+    private const EMPTY_STRING = '';
+
     private function __construct()
     {
     }
@@ -30,8 +33,8 @@ public static function mapDefinitionArguments(ContainerBuilder $container, array
     {
         $definitionsById = HashMap::collect($arguments)
             ->filter(static fn (Entry $e) => \is_string($e->value))
-            ->filter(static fn (Entry $e) => str_contains($e->value, '@'))
-            ->map(static fn (Entry $e) => str_replace('@', '', $e->value))
+            ->filter(static fn (Entry $e) => str_contains($e->value, self::SERVICE_PREFIX))
+            ->map(static fn (Entry $e) => str_replace(self::SERVICE_PREFIX, self::EMPTY_STRING, $e->value))
             ->filter(static fn (Entry $e) => $container->hasDefinition($e->value))
             ->map(static fn (Entry $e) => new Reference((string) $e->value))
             ->toAssocArray()

diff --git a/composer.lock b/composer.lock