Fix psalm

src/Container.php

@@ -73,7 +73,7 @@ final class Container implements ContainerInterface
  */
  private array $resetters = [];
  private bool $useResettersFromMeta = true;
- private LazyLoadingValueHolderFactory $lazyFactory;
+ private ?LazyLoadingValueHolderFactory $lazyFactory = null;
 
  /**
  * @param ContainerConfigInterface $config Container configuration.
@@ -633,17 +633,17 @@ private function buildProvider(mixed $provider): ServiceProviderInterface
  return $providerInstance;
  }
 
- private function decorateLazy(string $id, $definition): DefinitionInterface
+ private function decorateLazy(string $id, mixed $definition): DefinitionInterface
  {
  $factory = $this->getLazyLoadingValueHolderFactory();
  if (class_exists($id) || interface_exists($id)) {
  $class = $id;
- } elseif (is_array($definition)) {
- $class = $definition['class'];
+ } elseif (is_array($definition) && array_key_exists(ArrayDefinition::CLASS_NAME, $definition)) {
+ $class = (string) $definition[ArrayDefinition::CLASS_NAME];
  } else {
- throw new RuntimeException(
+ throw new InvalidConfigException(
  sprintf(
- 'Could not handle definition type "%s" with definition class "%s"',
+ 'Invalid definition: lazy services are only available with array definitions or references. Got type "%s" for definition ID: "%s"',
  get_debug_type($definition),
  $id,
  )
@@ -656,8 +656,14 @@ private function decorateLazy(string $id, $definition): DefinitionInterface
  private function getLazyLoadingValueHolderFactory(): LazyLoadingValueHolderFactory
  {
  if (!class_exists(LazyLoadingValueHolderFactory::class)) {
- throw new RuntimeException('You should install `ocramius/proxy-manager` if you want to use lazy services.');
+ throw new RuntimeException(
+ 'You should install `friendsofphp/proxy-manager-lts` if you want to use lazy services.'
+ );
+ }
+ if ($this->lazyFactory === null) {
+ $this->lazyFactory = new LazyLoadingValueHolderFactory();
  }
- return $this->lazyFactory ??= new LazyLoadingValueHolderFactory();
+
+ return $this->lazyFactory;
  }
 }

tests/Unit/LazyServiceContainerTest.php

@@ -16,7 +16,7 @@ class LazyServiceContainerTest extends TestCase
  protected function setUp(): void
  {
  if (!class_exists(LazyLoadingValueHolderFactory::class)) {
- $this->markTestSkipped('You should install `ocramius/proxy-manager` if you want to use lazy services.');
+ $this->markTestSkipped('You should install `friendsofphp/proxy-manager-lts` if you want to use lazy services.');
  }
  }
 
@@ -39,6 +39,7 @@ public function testIsTheSameObject(): void
  $object = $container->get($class);
 
  self::assertInstanceOf(LazyLoadingInterface::class, $object);
+ self::assertInstanceOf(EngineMarkOne::class, $object);
  self::assertFalse($object->isProxyInitialized());
  self::assertEquals($number, $object->getNumber());
  self::assertTrue($object->isProxyInitialized());
@@ -47,6 +48,7 @@ public function testIsTheSameObject(): void
  $object = $container->get($class);
 
  self::assertInstanceOf(LazyLoadingInterface::class, $object);
+ self::assertInstanceOf(EngineMarkOne::class, $object);
  self::assertTrue($object->isProxyInitialized());
  }