Merge pull request #1 from spaceonfire/develop

Split container responsibility

CHANGELOG.md

@@ -22,6 +22,18 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Nothing
 -->
 
+## [2.0.0] - 2020-06-21
+### Added
+- `ArgumentResolver` class as default implementation of `ResolverInterface`
+- `ReflectionFactory` class creates instance of any existing class and resolve constructor arguments
+- `ReflectionInvoker` class calls any given callable with resolved arguments
+- `ReflectionContainer` class acts like factory for any existing class
+
+### Removed
+- `Container` class does not manage any existing class no more
+- `Container` class does not implements `ResolverInterface` no more
+- Removed `AbstractContainerDecorator` class
+
 ## [1.0.0] - 2020-06-11
 ### Added
 - First release

Makefile

@@ -1,3 +1,6 @@
-run:
+start:
 	docker-compose up -d
 	docker-compose exec app bash
+
+stop:
+	docker-compose down

README.md

@@ -17,7 +17,14 @@ $ composer require spaceonfire/container
 ## Usage
 
 ```php
-$container = new spaceonfire\Container\Container();
+use spaceonfire\Container\Container;
+use spaceonfire\Container\ReflectionContainer;
+use spaceonfire\Container\ContainerChain;
+
+$container = new ContainerChain([
+    new Container(),
+    new ReflectionContainer(),
+]);
 ```
 
 ## Change log

ecs.yml

@@ -11,6 +11,8 @@ parameters:
   skip:
     Unused variable $_.: ~
     Unused parameter $_.: ~
+    SlevomatCodingStandard\Sniffs\Functions\UnusedParameterSniff.UnusedParameter:
+      - src/ReflectionContainer.php
 
 services:
   Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer: ~

phpstan.neon.dist

@@ -12,6 +12,5 @@ parameters:
 		- src/
 	ignoreErrors:
 		- '/expects callable(.*) array(.*) given\.$/'
-		- '/expects class-string(.*)string given\.$/'
 		- '/no value type specified in iterable type(.*)spaceonfire\\Container\\Definition\\DefinitionAggregate/'
 		- '/no value type specified in iterable type(.*)spaceonfire\\Container\\ServiceProvider\\ServiceProviderAggregate/'

src/Argument/ArgumentResolver.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace spaceonfire\Container\Argument;
+
+use ReflectionFunctionAbstract;
+use ReflectionMethod;
+use spaceonfire\Container\ContainerAwareTrait;
+use spaceonfire\Container\ContainerInterface;
+use spaceonfire\Container\Exception\ContainerException;
+use Throwable;
+
+final class ArgumentResolver implements ResolverInterface
+{
+    use ContainerAwareTrait;
+
+    /**
+     * ArgumentResolver constructor.
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->setContainer($container);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveArguments(ReflectionFunctionAbstract $reflection, array $arguments = []): array
+    {
+        $result = [];
+
+        foreach ($reflection->getParameters() as $parameter) {
+            try {
+                $name = $parameter->getName();
+
+                if (array_key_exists($name, $arguments)) {
+                    $v = $arguments[$name];
+                    if ($v instanceof Argument) {
+                        $v = $v->resolve($this->getContainer());
+                    }
+                    $result[$name] = $v;
+                    continue;
+                }
+
+                $class = $parameter->getClass();
+                $defaultValue = $parameter->isDefaultValueAvailable()
+                    ? new ArgumentValue($parameter->getDefaultValue())
+                    : null;
+
+                $argument = new Argument($name, $class === null ? null : $class->getName(), $defaultValue);
+
+                $result[$name] = $argument->resolve($this->getContainer());
+            } catch (Throwable $e) {
+                $location = $reflection->getName();
+
+                if ($reflection instanceof ReflectionMethod) {
+                    $location = $reflection->getDeclaringClass()->getName() . '::' . $location;
+                }
+
+                throw new ContainerException(
+                    sprintf('Unable to resolve `%s` in {%s}: %s', $parameter->getName(), $location, $e->getMessage()),
+                    $e->getCode(),
+                    $e
+                );
+            }
+        }
+
+        return array_values($result);
+    }
+}