Chore: Enhancement

- Fixed tests after removing AutowiredContainer;
- Enhanced unit tests;
- Added arguments to decorated closure: actual decorated service and current container;
- Dropped support for php 8.1;
- PHP Code Sniffer fixes;
- Updated example in README.md;

Signed-off-by: Oleksii Bulba <oleksii_bulba@epam.com>

Author: OleksiiBulba

.github/workflows/ci.yaml

@@ -13,11 +13,11 @@ jobs:
       fail-fast: false
       matrix:
         # normal, highest, non-dev installs
-        php-version: [ '8.1', '8.2' ]
+        php-version: [ '8.2' ]
         dependency-versions: [ 'highest' ]
         include:
           # testing lowest PHP version with the lowest dependencies
-          - php-version: '8.1'
+          - php-version: '8.2'
             dependency-versions: 'lowest'
 
           # testing dev versions with the highest PHP

README.md

@@ -2,7 +2,7 @@
 
 ### Requirements
 
-PHP  >= 8.0.0
+PHP  >= 8.2
 
 ### How to use the library
 
@@ -34,7 +34,7 @@ include 'vendor/autoload.php';
 ```php
 use \Micro\Component\DependencyInjection\Container;
 
-class Logger {
+class Logger implements LoggerInterface {
 }
 
 class Mailer {
@@ -43,10 +43,14 @@ class Mailer {
 
 $container = new Container();
 
-$container->register(Logger::class, function(Container $container) {
+$container->register(LoggerInterface::class, function(Container $container) {
     return new Logger();
 });
 
+$container->register('logger.doctrine', function(Container $container) {
+    return new Logger('doctrine-channel');
+});
+
 $container->register(Mailer::class, function(Container $container) {
     return new Mailer($container->get(Logger::class));
 });
@@ -70,13 +74,11 @@ class HelloWorldFacade implements HelloWorldFacadeInterface
     }
 }
 
-
-class HelloWorldDecorator implements HelloWorldFacadeInterface
+class NiceHelloWorldDecorator implements HelloWorldFacadeInterface
 {
     public function __construct(
-        private readonly HelloWorldFacadeInterface $decoratedService,
-    )
-    {
+        private readonly HelloWorldFacadeInterface $decoratedService
+    ) {
     }
 
     public function hello(string $name): string
@@ -87,25 +89,51 @@ class HelloWorldDecorator implements HelloWorldFacadeInterface
     }
 }
 
+class HelloWorldLoggerAwareDecorator implements HelloWorldFacadeInterface
+{
+    public function __construct(
+        private readonly HelloWorldFacadeInterface $decoratedService,
+        private readonly LoggerInterface $logger
+    ) {
+    }
+
+    public function hello(string $name): string
+    {
+        $result = $this->decoratedService->hello($name);
+        
+        $this->logger->info->info($result);
+        
+        return $result;
+    }
+}
+
 $container = new Container();
 
 $container->register(HelloWorldFacadeInterface::class, function () {
     return new HelloWorldFacade();
 });
 
+$container->register(HelloWorldFacadeInterface::class, function (
+    HelloWorldFacadeInterface $decorated
+) {
+    return new NiceHelloWorldDecorator($decorated);
+});
+
 $container->decorate(HelloWorldFacadeInterface::class, function(
-    HelloWorldFacadeInterface $serviceForDecoration
+    HelloWorldFacadeInterface $decorated,
+    Container $container
 ) {
-    return new HelloWorldLoggerAwareDecorator($serviceForDecoration);
+    return new HelloWorldLoggerAwareDecorator(
+        $decorated,
+        $container->get(LoggerInterface::class)
+    );
 });
 
 echo $container->get(HelloWorldFacadeInterface::class)->hello('Stas');
 // Output: Hello, Stas. I'm glad to see you
 
-
 ```
 
-
 ### Sample code for:
 
 - [PSR-11](https://www.php-fig.org/psr/psr-11/)

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.1 || ^8.2",
+        "php": "^8.2",
         "psr/container": "^2.0"
     },
     "require-dev": {

phpcs.xml

@@ -14,7 +14,12 @@
     <rule ref="Generic.ControlStructures.InlineControlStructure"/>
     <rule ref="Generic.Files.ByteOrderMark"/>
     <rule ref="Generic.Files.LineEndings"/>
-    <rule ref="Generic.Files.LineLength"/>
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="120"/>
+        </properties>
+    </rule>
     <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
     <rule ref="Generic.Formatting.MultipleStatementAlignment"/>
     <rule ref="Generic.Formatting.NoSpaceAfterCast"/>

src/Container.php

@@ -4,33 +4,25 @@
 
 use Micro\Component\DependencyInjection\Exception\ServiceNotRegisteredException;
 use Micro\Component\DependencyInjection\Exception\ServiceRegistrationException;
-use \Closure;
 use Psr\Container\ContainerInterface;
 
 class Container implements ContainerInterface, ContainerRegistryInterface, ContainerDecoratorInterface
 {
     /**
      * @var array<string, object>
      */
-    private array $services;
+    private array $services = [];
 
     /**
-     * @var array<string, Closure|string>
+     * @var array<string, \Closure|string>
      */
-    private array $servicesRaw;
+    private array $servicesRaw = [];
 
     /**
-     * @var array<string, array<Closure, int>>
+     * @var array<string, array<int, \Closure>>
      */
     private array $decorators = [];
 
-    public function __construct(
-    )
-    {
-        $this->services = [];
-        $this->servicesRaw = [];
-    }
-
     /**
      * @template T
      *
@@ -54,7 +46,7 @@ public function has(string $id): bool
     /**
      * {@inheritDoc}
      */
-    public function register(string $id, Closure $service): void
+    public function register(string $id, \Closure $service): void
     {
         if($this->has($id)) {
             throw new ServiceRegistrationException(sprintf('Service "%s" already registered', $id));
@@ -66,13 +58,13 @@ public function register(string $id, Closure $service): void
     /**
      * {@inheritDoc}
      */
-    public function decorate(string $id, Closure $service, int $priority = 0): void
+    public function decorate(string $id, \Closure $service, int $priority = 0): void
     {
         if(!array_key_exists($id, $this->decorators)) {
             $this->decorators[$id] = [];
         }
 
-        $this->decorators[$id][] = [$service, $priority];
+        $this->decorators[$id][$priority] = $service;
     }
 
     /**
@@ -93,16 +85,15 @@ private function lookup(string $id): object
 
     /**
      * @param string $serviceId
-     * @return object
      */
     protected function initializeService(string $serviceId): void
     {
         if(empty($this->servicesRaw[$serviceId])) {
             throw new ServiceNotRegisteredException($serviceId);
         }
 
-        $raw = $this->servicesRaw[$serviceId];
-        $service = $raw($this);
+        $raw                        = $this->servicesRaw[$serviceId];
+        $service                    = $raw($this);
         $this->services[$serviceId] = $service;
 
         if(!array_key_exists($serviceId, $this->decorators)) {
@@ -111,19 +102,10 @@ protected function initializeService(string $serviceId): void
 
         $decorators = $this->decorators[$serviceId];
 
-        usort($decorators, function(array $left, array $right): int {
-            $l = $left[1];
-            $r = $right[1];
-            if($l === $r) {
-                return 0;
-            }
-
-            return $left[1] > $right[1] ? 1 : -1;
-        });
+        ksort($decorators);
 
-        /** @var array<Closure, int> $decorator */
         foreach ($decorators as $decorator) {
-            $this->services[$serviceId] = $decorator[0]();
+            $this->services[$serviceId] = $decorator($this->services[$serviceId], $this);
         }
     }
 }

src/ContainerDecoratorInterface.php

@@ -12,4 +12,4 @@ interface ContainerDecoratorInterface
      * @return void
      */
     public function decorate(string $id, \Closure $service, int $priority = 0): void;
-}
+}

src/ContainerRegistryInterface.php

@@ -2,7 +2,6 @@
 
 namespace Micro\Component\DependencyInjection;
 
-
 interface ContainerRegistryInterface
 {
     /**

src/Exception/ServiceNotRegisteredException.php

@@ -4,8 +4,7 @@
 
 use Psr\Container\NotFoundExceptionInterface;
 
-class ServiceNotRegisteredException extends \RuntimeException
-    implements NotFoundExceptionInterface
+class ServiceNotRegisteredException extends \RuntimeException implements NotFoundExceptionInterface
 {
     private string $serviceId;
 

src/Exception/ServiceRegistrationException.php

@@ -4,8 +4,6 @@
 
 use Psr\Container\ContainerExceptionInterface;
 
-class ServiceRegistrationException extends \RuntimeException
-    implements ContainerExceptionInterface
+class ServiceRegistrationException extends \RuntimeException implements ContainerExceptionInterface
 {
-
 }