v1.7.1 Fix autowire helper and implements testsing tool (#10)

Author: Asisyas

.php-cs-fixer.dist.php

@@ -13,14 +13,6 @@
         "php": "^8.2",
         "micro/dependency-injection": "^1.6.4"
     },
-    "require-dev": {
-        "ergebnis/composer-normalize": "^2.29",
-        "friendsofphp/php-cs-fixer": "^3.13",
-        "phpstan/phpstan": "^1.9",
-        "phpunit/php-code-coverage": "^9.2",
-        "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^5.2"
-    },
     "autoload": {
         "psr-4": {
             "Micro\\Component\\DependencyInjection\\Autowire\\": "src/"
@@ -33,7 +25,8 @@
     },
     "config": {
         "allow-plugins": {
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "micro/testing-tool": true
         },
         "sort-packages": true
     },
@@ -56,5 +49,8 @@
             "composer normalize",
             "@coverage"
         ]
+    },
+    "require-dev": {
+        "micro/testing-tool": "^1.7"
     }
 }

composer.json

@@ -46,7 +46,7 @@ public function autowire(string|array|callable $target): callable
                     return new $target(...$arguments);
                 }
 
-                if (\is_object($target) && \is_callable($target)) {
+                if (\is_object($target)) {
                     $arguments = $this->resolveArguments([$target, '__invoke']);
 
                     return \call_user_func($target, ...$arguments);
@@ -56,14 +56,14 @@ public function autowire(string|array|callable $target): callable
                     $this->throwAutowireException($target, '');
                 }
 
-                $object = $target[0] ?? null;
-                $method = $target[1] ?? null;
+                $object = $target[0] ?? null; // @phpstan-ignore-line
+                $method = $target[1] ?? null; // @phpstan-ignore-line
                 $arguments = null;
 
                 if (\is_object($object)) {
                     if (!$method) {
                         if (!\is_callable($object)) {
-                            $this->throwAutowireException($target, sprintf('Object `%s` is not callable.', $object::class));
+                            $this->throwAutowireException($target, \sprintf('Object `%s` is not callable.', $object::class));
                         }
 
                         if (!($object instanceof \Closure)) {
@@ -117,7 +117,7 @@ protected function resolveStringAsObject(string $target): object
      *
      * @phpstan-ignore-next-line
      */
-    protected function throwAutowireException(string|array|callable $target, string $message, \Throwable $parent = null): void
+    protected function throwAutowireException(string|array|callable $target, string $message, ?\Throwable $parent = null): void
     {
         if (\is_array($target)) {
             $target = $target[0] ?? null;
@@ -131,13 +131,13 @@ protected function throwAutowireException(string|array|callable $target, string
             $target = $target::class;
         }
 
-        throw new AutowireException(sprintf('Can not autowire "%s". %s', $target, $message), 0, $parent);
+        throw new AutowireException(\sprintf('Can not autowire "%s". %s', $target, $message), 0, $parent);
     }
 
     /**
      * @phpstan-ignore-next-line
      */
-    protected function resolveArguments(string|array|object $target, string $method = null): array
+    protected function resolveArguments(string|array|object $target, ?string $method = null): array
     {
         if (\is_callable($target) && !$method && !\is_string($target)) {
             $ref = new \ReflectionFunction($target); // @phpstan-ignore-line
@@ -162,7 +162,7 @@ protected function resolveArguments(string|array|object $target, string $method
     }
 
     /**
-     * @throws \Psr\Container\ContainerExceptionInterface
+     * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      *
      * @phpstan-ignore-next-line
@@ -177,7 +177,7 @@ private function resolveArgumentsFromReflectionParametersObject(array $reflectio
             $parameterName = $parameter->getName();
             if (!$parameterType) {
                 if (!$allowedNull) {
-                    throw new \InvalidArgumentException(sprintf('The untyped argument `%s` cannot be autowired.', $parameterName));
+                    throw new \InvalidArgumentException(\sprintf('The untyped argument `%s` cannot be autowired.', $parameterName));
                 }
 
                 $arguments[] = null;
@@ -188,7 +188,7 @@ private function resolveArgumentsFromReflectionParametersObject(array $reflectio
             if (
                 !$parameterType instanceof \ReflectionNamedType
             ) {
-                throw new \InvalidArgumentException(sprintf('The argument `%s` has invalid type.', $parameterName));
+                throw new \InvalidArgumentException(\sprintf('The argument `%s` has invalid type.', $parameterName));
             }
 
             $parameterTypeName = $parameterType->getName();

phpcs.xml

@@ -13,12 +13,13 @@
 
 use Psr\Container\ContainerInterface;
 
-readonly class AutowireHelperFactory implements AutowireHelperFactoryInterface
+final readonly class AutowireHelperFactory implements AutowireHelperFactoryInterface
 {
     public function __construct(private ContainerInterface $container)
     {
     }
 
+    #[\Override]
     public function create(): AutowireHelperInterface
     {
         return new AutowireHelper($this->container);

phpmd.xml

@@ -13,7 +13,10 @@
 
 use Micro\Component\DependencyInjection\Container;
 
-class ContainerAutowire extends Container
+/**
+ * @psalm-suppress UnusedClass
+ */
+final class ContainerAutowire extends Container
 {
     private AutowireHelperFactoryInterface $autowireHelperFactory;
 
@@ -22,23 +25,27 @@ public function __construct(private readonly Container $container)
         $this->autowireHelperFactory = new AutowireHelperFactory($this->container);
     }
 
+    #[\Override]
     public function get(string $id): object
     {
         return $this->container->get($id);
     }
 
+    #[\Override]
     public function has(string $id): bool
     {
         return $this->container->has($id);
     }
 
+    #[\Override]
     public function register(string $id, callable $service, bool $force = false): void
     {
         $autowiredCallback = $this->autowireHelperFactory->create()->autowire($service);
 
         $this->container->register($id, $autowiredCallback, $force);
     }
 
+    #[\Override]
     public function decorate(string $id, callable $service, int $priority = 0): void
     {
         $autowiredCallback = $this->autowireHelperFactory->create()->autowire($service);

phpstan.neon.dist

@@ -17,7 +17,9 @@
 
 /**
  * @author Stanislau Komar <[email protected]>
+ *
+ * @psalm-suppress UnusedClass
  */
-class AutowireException extends \RuntimeException implements ContainerExceptionInterface
+final class AutowireException extends \RuntimeException implements ContainerExceptionInterface
 {
 }