Fix resolving lazy service

composer.json

@@ -25,12 +25,12 @@
  "php": "^8.0",
  "ext-mbstring": "*",
  "psr/container": "^1.1|^2.0",
- "yiisoft/definitions": "^3.0"
+ "yiisoft/definitions": "dev-lazy-definition"
  },
  "require-dev": {
  "league/container": "^4.2",
  "maglnet/composer-require-checker": "^4.2",
- "ocramius/proxy-manager": "^2.13",
+ "ocramius/proxy-manager": "^2.14.1",
  "phpbench/phpbench": "^1.2.0",
  "phpunit/phpunit": "^9.5",
  "rector/rector": "^0.14.3",

src/Container.php

@@ -7,12 +7,15 @@
 use Closure;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use Psr\Container\ContainerInterface;
+use RuntimeException;
 use Yiisoft\Definitions\ArrayDefinition;
+use Yiisoft\Definitions\Contract\DefinitionInterface;
 use Yiisoft\Definitions\Exception\CircularReferenceException;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 use Yiisoft\Definitions\Helpers\DefinitionValidator;
 use Yiisoft\Definitions\DefinitionStorage;
+use Yiisoft\Definitions\LazyDefinitionDecorator;
 use Yiisoft\Di\Helpers\DefinitionNormalizer;
 use Yiisoft\Di\Helpers\DefinitionParser;
 use Yiisoft\Di\Helpers\TagHelper;
@@ -614,27 +617,21 @@ private function buildProvider(mixed $provider): ServiceProviderInterface
  return $providerInstance;
  }
 
- /**
- * @param mixed $variable
- */
- private function getVariableType($variable): string
- {
- if (is_object($variable)) {
- return get_class($variable);
- }
-
- return gettype($variable);
- }
-
- private function decorateLazy(string $id, DefinitionInterface $definition): DefinitionInterface
+ private function decorateLazy(string $id, $definition): DefinitionInterface
  {
  $factory = $this->getLazyLoadingValueHolderFactory();
  if (class_exists($id) || interface_exists($id)) {
  $class = $id;
- } elseif ($definition instanceof ArrayDefinition) {
- $class = $definition->getClass();
+ } elseif (is_array($definition)) {
+ $class = $definition['class'];
  } else {
- throw new \RuntimeException('Could not determinate object class');
+ throw new RuntimeException(
+ sprintf(
+ 'Could not handle definition type "%s" with definition class "%s"',
+ get_debug_type($definition),
+ $id,
+ )
+ );
  }
 
  return new LazyDefinitionDecorator($factory, $definition, $class);
@@ -643,7 +640,7 @@ private function decorateLazy(string $id, DefinitionInterface $definition): Defi
  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 `ocramius/proxy-manager` if you want to use lazy services.');
  }
  return $this->lazyFactory ??= new LazyLoadingValueHolderFactory();
  }

tests/Unit/LazyServiceContainerTest.php

@@ -5,15 +5,17 @@
 namespace Yiisoft\Di\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
+use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Yiisoft\Di\Container;
+use Yiisoft\Di\ContainerConfig;
 use Yiisoft\Di\Tests\Support\EngineMarkOne;
 
 class LazyServiceContainerTest extends TestCase
 {
  protected function setUp(): void
  {
- if (!class_exists(\ProxyManager\Factory\LazyLoadingValueHolderFactory::class)) {
+ if (!class_exists(LazyLoadingValueHolderFactory::class)) {
  $this->markTestSkipped('You should install `ocramius/proxy-manager` if you want to use lazy services.');
  }
  }
@@ -23,23 +25,25 @@ public function testIsTheSameObject(): void
  $class = EngineMarkOne::class;
  $number = 55;
 
- $container = new Container([
- EngineMarkOne::class => [
- 'class' => $class,
- 'setNumber()' => [$number],
- 'lazy' => true,
- ],
- ]);
+ $config = ContainerConfig::create()
+ ->withDefinitions([
+ EngineMarkOne::class => [
+ 'class' => $class,
+ 'setNumber()' => [$number],
+ 'lazy' => true,
+ ],
+ ]);
+ $container = new Container($config);
 
- /* @var \Yiisoft\Di\Tests\Support\EngineMarkOne $object */
+ /* @var EngineMarkOne $object */
  $object = $container->get($class);
 
  self::assertInstanceOf(LazyLoadingInterface::class, $object);
  self::assertFalse($object->isProxyInitialized());
  self::assertEquals($number, $object->getNumber());
  self::assertTrue($object->isProxyInitialized());
 
- /* @var \Yiisoft\Di\Tests\Support\EngineMarkOne $object */
+ /* @var EngineMarkOne $object */
  $object = $container->get($class);
 
  self::assertInstanceOf(LazyLoadingInterface::class, $object);
@@ -51,7 +55,9 @@ public function testIsTheSameObject(): void
  */
  public function testLazy(array $definitions, string $id): void
  {
- $container = new Container($definitions);
+ $config = ContainerConfig::create()
+ ->withDefinitions($definitions);
+ $container = new Container($config);
 
  $object = $container->get($id);