Fix container dependencies

Author: Asisyas

src/Container.php

@@ -27,15 +27,9 @@ class Container implements ContainerInterface, ContainerRegistryInterface, Conta
      */
     private array $decorators = [];
 
-    /**
-     * @var AutowireHelperFactoryInterface
-     */
-    private AutowireHelperFactoryInterface $autowireHelperFactory;
-
     public function __construct(
     )
     {
-        $this->autowireHelperFactory = new AutowireHelperFactory($this);
         $this->services = [];
         $this->servicesRaw = [];
     }
@@ -107,9 +101,7 @@ protected function initializeService(string $serviceId): void
         }
 
         $raw = $this->servicesRaw[$serviceId];
-
         $service = $raw($this);
-
         $this->services[$serviceId] = $service;
 
         if(!array_key_exists($serviceId, $this->decorators)) {
@@ -122,10 +114,9 @@ protected function initializeService(string $serviceId): void
             return $left[1] > $right[1];
         });
 
-        $helper = $this->autowireHelperFactory->create();
-
+        /** @var array<Closure, int> $decorator */
         foreach ($decorators as $decorator) {
-            $this->services[$serviceId] = $helper->autowire($decorator[0])();
+            $this->services[$serviceId] = $decorator[0]();
         }
     }
 }

tests/unit/ContainerTest.php

@@ -2,6 +2,7 @@
 
 namespace Micro\Component\DependencyInjection\Tests;
 
+use Micro\Component\DependencyInjection\Autowire\ContainerAutowire;
 use Micro\Component\DependencyInjection\Container;
 use Micro\Component\DependencyInjection\Exception\ServiceNotRegisteredException;
 use Micro\Component\DependencyInjection\Exception\ServiceRegistrationException;
@@ -63,7 +64,7 @@ public function testContainerUnresolvedException(): void
 
     public function testDecorateService(): void
     {
-        $container = new Container();
+        $container = new ContainerAutowire(new Container());
 
         $container->register('test', function ($container) {
             return new class {