Merge pull request #280 from dotkernel/issue-266

Issue #266: Replaced annotation-based dependency injection with attribute-based dependency injection

composer.json

@@ -49,12 +49,12 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0",
-        "ext-json": "*",
         "ext-gd": "*",
-        "dotkernel/dot-annotated-services": "^4.1.7",
+        "ext-json": "*",
         "dotkernel/dot-cache": "^4.0",
         "dotkernel/dot-cli": "^3.5.0",
         "dotkernel/dot-data-fixtures": "^1.1.3",
+        "dotkernel/dot-dependency-injection": "^1.0",
         "dotkernel/dot-errorhandler": "^3.3.2",
         "dotkernel/dot-mail": "^4.1.1",
         "dotkernel/dot-response-header": "^3.2.3",

config/config.php

@@ -44,7 +44,7 @@ class_exists(Mezzio\Tooling\ConfigProvider::class)
     Dot\Cli\ConfigProvider::class,
     Dot\Log\ConfigProvider::class,
     Dot\ErrorHandler\ConfigProvider::class,
-    Dot\AnnotatedServices\ConfigProvider::class,
+    Dot\DependencyInjection\ConfigProvider::class,
     Dot\ResponseHeader\ConfigProvider::class,
     Dot\Mail\ConfigProvider::class,
     Dot\DataFixtures\ConfigProvider::class,

src/Admin/src/ConfigProvider.php

@@ -20,8 +20,8 @@
 use Api\Admin\Service\AdminService;
 use Api\Admin\Service\AdminServiceInterface;
 use Api\App\ConfigProvider as AppConfigProvider;
-use Dot\AnnotatedServices\Factory\AnnotatedRepositoryFactory;
-use Dot\AnnotatedServices\Factory\AnnotatedServiceFactory;
+use Dot\DependencyInjection\Factory\AttributedRepositoryFactory;
+use Dot\DependencyInjection\Factory\AttributedServiceFactory;
 use Mezzio\Hal\Metadata\MetadataMap;
 
 class ConfigProvider
@@ -38,14 +38,14 @@ public function getDependencies(): array
     {
         return [
             'factories' => [
-                AdminHandler::class        => AnnotatedServiceFactory::class,
-                AdminAccountHandler::class => AnnotatedServiceFactory::class,
-                AdminRoleHandler::class    => AnnotatedServiceFactory::class,
-                AdminService::class        => AnnotatedServiceFactory::class,
-                AdminRoleService::class    => AnnotatedServiceFactory::class,
+                AdminHandler::class        => AttributedServiceFactory::class,
+                AdminAccountHandler::class => AttributedServiceFactory::class,
+                AdminRoleHandler::class    => AttributedServiceFactory::class,
+                AdminService::class        => AttributedServiceFactory::class,
+                AdminRoleService::class    => AttributedServiceFactory::class,
                 AdminCreateCommand::class  => AdminCreateCommandFactory::class,
-                AdminRepository::class     => AnnotatedRepositoryFactory::class,
-                AdminRoleRepository::class => AnnotatedRepositoryFactory::class,
+                AdminRepository::class     => AttributedRepositoryFactory::class,
+                AdminRoleRepository::class => AttributedRepositoryFactory::class,
             ],
             'aliases'   => [
                 AdminServiceInterface::class     => AdminService::class,

src/Admin/src/Handler/AdminAccountHandler.php

@@ -11,7 +11,7 @@
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\HandlerTrait;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
 use Psr\Http\Message\ResponseInterface;
@@ -22,14 +22,12 @@ class AdminAccountHandler implements RequestHandlerInterface
 {
     use HandlerTrait;
 
-    /**
-     * @Inject({
-     *     HalResponseFactory::class,
-     *     ResourceGenerator::class,
-     *     AdminServiceInterface::class,
-     *     "config"
-     * })
-     */
+    #[Inject(
+        HalResponseFactory::class,
+        ResourceGenerator::class,
+        AdminServiceInterface::class,
+        "config",
+    )]
     public function __construct(
         protected HalResponseFactory $responseFactory,
         protected ResourceGenerator $resourceGenerator,

src/Admin/src/Handler/AdminHandler.php

@@ -11,7 +11,7 @@
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\HandlerTrait;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
 use Psr\Http\Message\ResponseInterface;
@@ -22,14 +22,12 @@ class AdminHandler implements RequestHandlerInterface
 {
     use HandlerTrait;
 
-    /**
-     * @Inject({
-     *     HalResponseFactory::class,
-     *     ResourceGenerator::class,
-     *     AdminServiceInterface::class,
-     *     "config",
-     * })
-     */
+    #[Inject(
+        HalResponseFactory::class,
+        ResourceGenerator::class,
+        AdminServiceInterface::class,
+        "config",
+    )]
     public function __construct(
         protected HalResponseFactory $responseFactory,
         protected ResourceGenerator $resourceGenerator,

src/Admin/src/Handler/AdminRoleHandler.php

@@ -7,7 +7,7 @@
 use Api\Admin\Service\AdminRoleServiceInterface;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\HandlerTrait;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
 use Psr\Http\Message\ResponseInterface;
@@ -18,14 +18,12 @@ class AdminRoleHandler implements RequestHandlerInterface
 {
     use HandlerTrait;
 
-    /**
-     * @Inject({
-     *     HalResponseFactory::class,
-     *     ResourceGenerator::class,
-     *     AdminRoleServiceInterface::class,
-     *     "config"
-     * })
-     */
+    #[Inject(
+        HalResponseFactory::class,
+        ResourceGenerator::class,
+        AdminRoleServiceInterface::class,
+        "config",
+    )]
     public function __construct(
         protected HalResponseFactory $responseFactory,
         protected ResourceGenerator $resourceGenerator,

src/Admin/src/Repository/AdminRepository.php

@@ -10,12 +10,12 @@
 use Api\App\Helper\PaginationHelper;
 use Api\App\Message;
 use Doctrine\ORM\EntityRepository;
-use Dot\AnnotatedServices\Annotation\Entity;
+use Dot\DependencyInjection\Attribute\Entity;
 
 /**
- * @Entity(name="Api\Admin\Entity\Admin")
  * @extends EntityRepository<object>
  */
+#[Entity(name: Admin::class)]
 class AdminRepository extends EntityRepository
 {
     public function deleteAdmin(Admin $admin): void

src/Admin/src/Repository/AdminRoleRepository.php

@@ -8,12 +8,12 @@
 use Api\Admin\Entity\AdminRole;
 use Api\App\Helper\PaginationHelper;
 use Doctrine\ORM\EntityRepository;
-use Dot\AnnotatedServices\Annotation\Entity;
+use Dot\DependencyInjection\Attribute\Entity;
 
 /**
- * @Entity(name="Api\Admin\Entity\AdminRole")
  * @extends EntityRepository<object>
  */
+#[Entity(name: AdminRole::class)]
 class AdminRoleRepository extends EntityRepository
 {
     public function getAdminRoles(array $filters = []): AdminRoleCollection

src/Admin/src/Service/AdminRoleService.php

@@ -9,17 +9,15 @@
 use Api\Admin\Repository\AdminRoleRepository;
 use Api\App\Exception\NotFoundException;
 use Api\App\Message;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 
 class AdminRoleService implements AdminRoleServiceInterface
 {
-    /**
-     * @Inject({
-     *     AdminRoleRepository::class
-     * })
-     */
+    #[Inject(
+        AdminRoleRepository::class,
+    )]
     public function __construct(
-        protected AdminRoleRepository $adminRoleRepository
+        protected AdminRoleRepository $adminRoleRepository,
     ) {
     }
 

src/Admin/src/Service/AdminService.php

@@ -11,19 +11,17 @@
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Message;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 
 class AdminService implements AdminServiceInterface
 {
-    /**
-     * @Inject({
-     *     AdminRoleService::class,
-     *     AdminRepository::class
-     * })
-     */
+    #[Inject(
+        AdminRoleService::class,
+        AdminRepository::class,
+    )]
     public function __construct(
         protected AdminRoleService $adminRoleService,
-        protected AdminRepository $adminRepository
+        protected AdminRepository $adminRepository,
     ) {
     }
 

src/App/src/ConfigProvider.php

@@ -20,7 +20,7 @@
 use Api\App\Service\ErrorReportServiceInterface;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
-use Dot\AnnotatedServices\Factory\AnnotatedServiceFactory;
+use Dot\DependencyInjection\Factory\AttributedServiceFactory;
 use Dot\Mail\Factory\MailOptionsAbstractFactory;
 use Dot\Mail\Factory\MailServiceAbstractFactory;
 use Dot\Mail\Service\MailService;
@@ -64,16 +64,16 @@ public function getDependencies(): array
                 'dot-mail.options.default'            => MailOptionsAbstractFactory::class,
                 'dot-mail.service.default'            => MailServiceAbstractFactory::class,
                 AuthenticationMiddleware::class       => AuthenticationMiddlewareFactory::class,
-                AuthorizationMiddleware::class        => AnnotatedServiceFactory::class,
-                ContentNegotiationMiddleware::class   => AnnotatedServiceFactory::class,
+                AuthorizationMiddleware::class        => AttributedServiceFactory::class,
+                ContentNegotiationMiddleware::class   => AttributedServiceFactory::class,
                 Environment::class                    => TwigEnvironmentFactory::class,
                 TwigExtension::class                  => TwigExtensionFactory::class,
                 TwigRenderer::class                   => TwigRendererFactory::class,
-                HomeHandler::class                    => AnnotatedServiceFactory::class,
-                ErrorResponseMiddleware::class        => AnnotatedServiceFactory::class,
+                HomeHandler::class                    => AttributedServiceFactory::class,
+                ErrorResponseMiddleware::class        => AttributedServiceFactory::class,
                 RouteListCommand::class               => RouteListCommandFactory::class,
                 TokenGenerateCommand::class           => TokenGenerateCommandFactory::class,
-                ErrorReportService::class             => AnnotatedServiceFactory::class,
+                ErrorReportService::class             => AttributedServiceFactory::class,
                 EntityListenerResolver::class         => EntityListenerResolverFactory::class,
             ],
             'aliases'    => [

src/App/src/Handler/ErrorReportHandler.php

@@ -7,8 +7,7 @@
 use Api\App\Exception\ForbiddenException;
 use Api\App\Message;
 use Api\App\Service\ErrorReportServiceInterface;
-use Dot\AnnotatedServices\Annotation\Inject;
-use Dot\AnnotatedServices\Annotation\Service;
+use Dot\DependencyInjection\Attribute\Inject;
 use Fig\Http\Message\StatusCodeInterface;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
@@ -17,21 +16,16 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
 
-/**
- * @Service
- */
 class ErrorReportHandler implements RequestHandlerInterface
 {
     use HandlerTrait;
 
-    /**
-     * @Inject({
-     *     HalResponseFactory::class,
-     *     ResourceGenerator::class,
-     *     ErrorReportServiceInterface::class,
-     *     "config"
-     * })
-     */
+    #[Inject(
+        HalResponseFactory::class,
+        ResourceGenerator::class,
+        ErrorReportServiceInterface::class,
+        "config",
+    )]
     public function __construct(
         protected HalResponseFactory $responseFactory,
         protected ResourceGenerator $resourceGenerator,

src/App/src/Handler/HomeHandler.php

@@ -4,7 +4,7 @@
 
 namespace Api\App\Handler;
 
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
 use Psr\Http\Message\ResponseInterface;
@@ -14,13 +14,11 @@ class HomeHandler implements RequestHandlerInterface
 {
     use HandlerTrait;
 
-    /**
-     * @Inject({
-     *     HalResponseFactory::class,
-     *     ResourceGenerator::class,
-     *     "config"
-     * })
-     */
+    #[Inject(
+        HalResponseFactory::class,
+        ResourceGenerator::class,
+        "config",
+    )]
     public function __construct(
         protected HalResponseFactory $responseFactory,
         protected ResourceGenerator $resourceGenerator,

src/App/src/Middleware/AuthorizationMiddleware.php

@@ -12,7 +12,7 @@
 use Api\App\UserIdentity;
 use Api\User\Entity\User;
 use Api\User\Repository\UserRepository;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
 use Mezzio\Authentication\UserInterface;
@@ -27,17 +27,15 @@
 
 class AuthorizationMiddleware implements MiddlewareInterface
 {
-    /**
-     * @Inject({
-     *     AuthorizationInterface::class,
-     *     UserRepository::class,
-     *     AdminRepository::class
-     * })
-     */
+    #[Inject(
+        AuthorizationInterface::class,
+        UserRepository::class,
+        AdminRepository::class,
+    )]
     public function __construct(
         protected AuthorizationInterface $authorization,
         protected UserRepository $userRepository,
-        protected AdminRepository $adminRepository
+        protected AdminRepository $adminRepository,
     ) {
     }
 

src/App/src/Middleware/ContentNegotiationMiddleware.php

@@ -5,7 +5,7 @@
 namespace Api\App\Middleware;
 
 use Api\App\Handler\ResponseTrait;
-use Dot\AnnotatedServices\Annotation\Inject;
+use Dot\DependencyInjection\Attribute\Inject;
 use Mezzio\Router\RouteResult;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -26,11 +26,12 @@ class ContentNegotiationMiddleware implements MiddlewareInterface
 {
     use ResponseTrait;
 
-    /**
-     * @Inject({"config.content-negotiation"})
-     */
-    public function __construct(private array $config)
-    {
+    #[Inject(
+        "config.content-negotiation",
+    )]
+    public function __construct(
+        private array $config,
+    ) {
     }
 
     public function process(