Pass instance of proxied service to the proxy function (#258)

* Clean providers

* Pass instance of proxied service to the proxy function

config/di-providers.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Yii\Debug\ProxyServiceProvider;
+use Yiisoft\Yii\Debug\DebugServiceProvider;
 
-if (!(bool)($params['yiisoft/yii-debug']['enabled'] ?? false)) {
+if (!(bool) ($params['yiisoft/yii-debug']['enabled'] ?? false)) {
     return [];
 }
 
 return [
-    'yiisoft/yii-debug/Debugger' => ProxyServiceProvider::class,
+    'yiisoft/yii-debug/' . DebugServiceProvider::class => DebugServiceProvider::class,
 ];

config/di.php

@@ -30,6 +30,7 @@
         if (isset($params['historySize'])) {
             $fileStorage->setHistorySize((int) $params['historySize']);
         }
+
         return $fileStorage;
     },
 ];
@@ -47,6 +48,7 @@
         $trackedServices = (array) ($params['trackedServices'] ?? []);
         $path = $container->get(Aliases::class)->get('@runtime/cache/container-proxy');
         $logLevel = $params['logLevel'] ?? ContainerInterfaceProxy::LOG_NOTHING;
+
         return new ContainerProxyConfig(
             $debuggerEnabled,
             $trackedServices,

src/Collector/ContainerInterfaceProxy.php

@@ -104,7 +104,7 @@ private function getServiceProxy(string $service, object $instance): ?object
         }
 
         if ($this->config->hasDecoratedServiceCallableConfig($service)) {
-            return $this->getServiceProxyFromCallable($this->config->getDecoratedServiceConfig($service));
+            return $this->getServiceProxyFromCallable($this->config->getDecoratedServiceConfig($service), $instance);
         }
 
         if ($this->config->hasDecoratedServiceArrayConfigWithStringKeys($service)) {
@@ -126,9 +126,9 @@ interface_exists($service) || class_exists($service) ? $service : $instance::cla
         return null;
     }
 
-    private function getServiceProxyFromCallable(callable $callback): ?object
+    private function getServiceProxyFromCallable(callable $callback, object $instance): ?object
     {
-        return $callback($this);
+        return $callback($this, $instance);
     }
 
     /**

src/DebugServiceProvider.php

@@ -5,26 +5,25 @@
 namespace Yiisoft\Yii\Debug;
 
 use Psr\Container\ContainerInterface;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Psr\Log\LoggerInterface;
 use Yiisoft\Di\ServiceProviderInterface;
-use Yiisoft\Yii\Debug\Collector\EventCollector;
-use Yiisoft\Yii\Debug\Collector\LogCollector;
-use Yiisoft\Yii\Debug\Collector\EventDispatcherInterfaceProxy;
-use Yiisoft\Yii\Debug\Collector\LoggerInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\ContainerInterfaceProxy;
+use Yiisoft\Yii\Debug\Collector\ContainerProxyConfig;
 
 final class DebugServiceProvider implements ServiceProviderInterface
 {
     public function getDefinitions(): array
     {
-        return [];
+        return [
+            ContainerInterface::class => static fn (ContainerInterface $container) => new ContainerInterfaceProxy(
+                $container,
+                $container->get(ContainerProxyConfig::class),
+            ),
+        ];
     }
 
     public function getExtensions(): array
     {
         return [
-            LoggerInterface::class => static fn (ContainerInterface $container, LoggerInterface $logger) => new LoggerInterfaceProxy($logger, $container->get(LogCollector::class)),
-            EventDispatcherInterface::class => static fn (ContainerInterface $container, EventDispatcherInterface $dispatcher) => new EventDispatcherInterfaceProxy($dispatcher, $container->get(EventCollector::class)),
         ];
     }
 }