improve

src/Container.php

@@ -202,7 +202,6 @@ public function get(string $id)
      */
     private function addDefinition(string $id, mixed $definition): void
     {
-        /** @var mixed $definition */
         [$definition, $meta] = DefinitionParser::parse($definition);
         if ($this->validate) {
             $this->validateDefinition($definition, $id);
@@ -630,11 +629,22 @@ private function buildProvider(mixed $provider): ServiceProviderInterface
 
     private function decorateLazy(string $id, mixed $definition): DefinitionInterface
     {
-        if (class_exists($id) || interface_exists($id)) {
-            $class = $id;
-        } elseif (is_array($definition) && array_key_exists(ArrayDefinition::CLASS_NAME, $definition)) {
-            $class = (string) $definition[ArrayDefinition::CLASS_NAME];
+        $class = class_exists($id) || interface_exists($id) ? $id : null;
+
+        if (is_array($definition) && isset($definition[DefinitionParser::IS_PREPARED_ARRAY_DEFINITION_DATA])) {
+            if (empty($class)) {
+                $class = $definition[ArrayDefinition::CLASS_NAME];
+            }
+            $preparedDefinition = ArrayDefinition::fromPreparedData(
+                $definition[ArrayDefinition::CLASS_NAME] ?? $class,
+                $definition[ArrayDefinition::CONSTRUCTOR],
+                $definition['methodsAndProperties'],
+            );
         } else {
+            $preparedDefinition = $definition;
+        }
+
+        if (empty($class)) {
             throw new InvalidConfigException(
                 sprintf(
                     'Invalid definition: lazy services are only available with array definitions or references. Got type "%s" for definition ID: "%s"',
@@ -644,10 +654,6 @@ private function decorateLazy(string $id, mixed $definition): DefinitionInterfac
             );
         }
 
-        /**
-         * @var class-string $class
-         */
-
-        return new LazyDefinition($definition, $class);
+        return new LazyDefinition($preparedDefinition, $class);
     }
 }