diff --git a/bin/doctrine-migrations-log.php b/bin/doctrine-migrations-log.php index 58946e8..2376a4e 100644 --- a/bin/doctrine-migrations-log.php +++ b/bin/doctrine-migrations-log.php @@ -3,7 +3,7 @@ require_once __DIR__ . '/../config/autoload/defines.php'; require APP_ROOT . '/vendor/autoload.php'; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\DBAL\DriverManager; use Doctrine\Migrations\Configuration\Configuration; @@ -40,7 +40,7 @@ $driver = new AnnotationDriver($reader, $paths); $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode); $config->setMetadataDriverImpl($driver); -$entityManager = $container->get(TemplateEntityManager::class); +$entityManager = $container->get(EntityManager::class); try { $connection = DriverManager::getConnection($dbParams); diff --git a/bin/doctrine-migrations.php b/bin/doctrine-migrations.php index 984881f..879eb04 100644 --- a/bin/doctrine-migrations.php +++ b/bin/doctrine-migrations.php @@ -3,7 +3,7 @@ require_once __DIR__ . '/../config/autoload/defines.php'; require APP_ROOT . '/vendor/autoload.php'; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\DBAL\DriverManager; use Doctrine\Migrations\Configuration\Configuration; @@ -40,7 +40,7 @@ $driver = new AnnotationDriver($reader, $paths); $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode); $config->setMetadataDriverImpl($driver); -$entityManager = $container->get(TemplateEntityManager::class); +$entityManager = $container->get(EntityManager::class); try { $connection = DriverManager::getConnection($dbParams); diff --git a/config/config.php b/config/config.php index 8d3f7dd..814b150 100644 --- a/config/config.php +++ b/config/config.php @@ -54,7 +54,6 @@ $aggregator = new ConfigAggregator([ \Template\Infrastructure\Session\ConfigProvider::class, // HandlingDomain - \Template\Handling\Product\ConfigProvider::class, \Template\Handling\User\ConfigProvider::class, \Template\Handling\UserSession\ConfigProvider::class, \Template\Handling\Registration\ConfigProvider::class, @@ -65,7 +64,6 @@ $aggregator = new ConfigAggregator([ /// External \Template\API\External\Health\ConfigProvider::class, - \Template\API\External\Product\ConfigProvider::class, \Template\API\External\User\ConfigProvider::class, \Template\API\External\Authentication\ConfigProvider::class, diff --git a/data/migrations/homepage/Version20230922085011.php b/data/migrations/business/Version20230922085011.php similarity index 92% rename from data/migrations/homepage/Version20230922085011.php rename to data/migrations/business/Version20230922085011.php index 0784eb9..de5b8ec 100644 --- a/data/migrations/homepage/Version20230922085011.php +++ b/data/migrations/business/Version20230922085011.php @@ -18,7 +18,6 @@ final class Version20230922085011 extends AbstractMigration { $sql = "CREATE TABLE role ( id binary(16) NOT NULL, - product_id binary(16) DEFAULT NULL, identifier varchar(255) UNIQUE NOT NULL, PRIMARY KEY (id) );"; diff --git a/data/migrations/homepage/Version20230922092351.php b/data/migrations/business/Version20230922092351.php similarity index 93% rename from data/migrations/homepage/Version20230922092351.php rename to data/migrations/business/Version20230922092351.php index ca2c727..a759ef4 100644 --- a/data/migrations/homepage/Version20230922092351.php +++ b/data/migrations/business/Version20230922092351.php @@ -21,7 +21,6 @@ final class Version20230922092351 extends AbstractMigration { $sql = "CREATE TABLE permission ( id binary(16) NOT NULL, - product_id binary(16) DEFAULT NULL, identifier varchar(255) UNIQUE NOT NULL, PRIMARY KEY (id) );"; diff --git a/data/migrations/homepage/Version20230922092754.php b/data/migrations/business/Version20230922092754.php similarity index 100% rename from data/migrations/homepage/Version20230922092754.php rename to data/migrations/business/Version20230922092754.php diff --git a/data/migrations/homepage/Version20230922101354.php b/data/migrations/business/Version20230922101354.php similarity index 100% rename from data/migrations/homepage/Version20230922101354.php rename to data/migrations/business/Version20230922101354.php diff --git a/data/migrations/homepage/Version20230922101355.php b/data/migrations/business/Version20230922101355.php similarity index 100% rename from data/migrations/homepage/Version20230922101355.php rename to data/migrations/business/Version20230922101355.php diff --git a/data/migrations/homepage/Version20230924113403.php b/data/migrations/business/Version20230924113403.php similarity index 94% rename from data/migrations/homepage/Version20230924113403.php rename to data/migrations/business/Version20230924113403.php index 40fe724..fbd6512 100644 --- a/data/migrations/homepage/Version20230924113403.php +++ b/data/migrations/business/Version20230924113403.php @@ -23,7 +23,6 @@ final class Version20230924113403 extends AbstractMigration id binary(16) NOT NULL, mail varchar(255) NOT NULL, username varchar(255) NOT NULL, - password varchar(255) NOT NULL, created_at datetime NOT NULL, PRIMARY KEY (id) );"; diff --git a/data/migrations/homepage/Version20230922101352.php b/data/migrations/homepage/Version20230922101352.php deleted file mode 100644 index 44fe20f..0000000 --- a/data/migrations/homepage/Version20230922101352.php +++ /dev/null @@ -1,38 +0,0 @@ -addSql($sql); - } - - public function down(Schema $schema): void - { - $this->addSql("DROP TABLE product;"); - } -} diff --git a/data/migrations/homepage/Version20231021103120.php b/data/migrations/homepage/Version20231021103120.php deleted file mode 100644 index 5392834..0000000 --- a/data/migrations/homepage/Version20231021103120.php +++ /dev/null @@ -1,33 +0,0 @@ -addSql($sql); - } - - public function down(Schema $schema): void - { - $sql = "ALTER TABLE registration ADD COLUMN password varchar(255) NOT NULL after username"; - - $this->addSql($sql); - } -} diff --git a/data/migrations/homepage/Version20231021112654.php b/data/migrations/homepage/Version20231021112654.php deleted file mode 100644 index efcc53d..0000000 --- a/data/migrations/homepage/Version20231021112654.php +++ /dev/null @@ -1,33 +0,0 @@ -addSql($sql); - } - - public function down(Schema $schema): void - { - $sql = "ALTER TABLE product DROP COLUMN url;"; - - $this->addSql($sql); - } -} diff --git a/src/ApiDomain/Console/src/Command/InitializeDataCommand.php b/src/ApiDomain/Console/src/Command/InitializeDataCommand.php index c5810cb..0d402ba 100644 --- a/src/ApiDomain/Console/src/Command/InitializeDataCommand.php +++ b/src/ApiDomain/Console/src/Command/InitializeDataCommand.php @@ -6,7 +6,7 @@ use Template\Data\Business\Entity\Role; use Template\Data\Business\Entity\User; use Template\Data\Business\Repository\RoleRepository; use Template\Data\Business\Repository\UserRepository; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Template\Infrastructure\Encryption\Client\EncryptionClient; use Template\Infrastructure\Logging\Logger\Logger; use Symfony\Component\Console\Attribute\AsCommand; @@ -23,7 +23,7 @@ class InitializeDataCommand extends Command public function __construct( private readonly EncryptionClient $encryptionClient, - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly Logger $logger, ) { parent::__construct($this->getName()); diff --git a/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php b/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php index ebee2fb..bb4a2be 100644 --- a/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php +++ b/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php @@ -6,7 +6,7 @@ use Template\Data\Business\Entity\Permission; use Template\Data\Business\Entity\Role; use Template\Data\Business\Repository\PermissionRepository; use Template\Data\Business\Repository\RoleRepository; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Template\Infrastructure\Logging\Logger\Logger; use Reinfi\DependencyInjection\Service\ConfigService; use Symfony\Component\Console\Attribute\AsCommand; @@ -24,7 +24,7 @@ class RbacUpdateCommand extends Command public function __construct( private readonly ConfigService $configService, - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly Logger $logger, ) { parent::__construct($this->getName()); diff --git a/src/DataDomain/Business/config/doctrine.php b/src/DataDomain/Business/config/doctrine.php index 9e24b55..07bff44 100644 --- a/src/DataDomain/Business/config/doctrine.php +++ b/src/DataDomain/Business/config/doctrine.php @@ -46,7 +46,7 @@ return [ 'migrations_configuration' => [ 'orm_template' => [ - 'directory' => 'data/migrations/template', + 'directory' => 'data/migrations/business', 'name' => 'Doctrine Database Migrations for Template', 'namespace' => 'Template\Migrations\Template', 'table' => 'migrations', diff --git a/src/DataDomain/Business/config/service_manager.php b/src/DataDomain/Business/config/service_manager.php index a4c36f2..c0faf40 100644 --- a/src/DataDomain/Business/config/service_manager.php +++ b/src/DataDomain/Business/config/service_manager.php @@ -1,21 +1,21 @@ [ - 'doctrine.entity_manager.orm_template' => [EntityManagerFactory::class, 'orm_template'], + 'doctrine.entity_manager.orm_template' => [BaseEntityManagerFactory::class, 'orm_template'], 'doctrine.configuration.orm_template' => [ConfigurationFactory::class, 'orm_template'], 'doctrine.connection.orm_template' => [ConnectionFactory::class, 'orm_template'], - TemplateEntityManager::class => TemplateEntityManagerFactory::class, + EntityManager::class => EntityManagerFactory::class, - UserRepository::class => [AutowireRepositoryFactory::class, TemplateEntityManager::class, User::class], + UserRepository::class => [AutowireRepositoryFactory::class, EntityManager::class, User::class], ], ]; diff --git a/src/DataDomain/Business/src/Entity/Permission.php b/src/DataDomain/Business/src/Entity/Permission.php index 5db6c05..96f3258 100644 --- a/src/DataDomain/Business/src/Entity/Permission.php +++ b/src/DataDomain/Business/src/Entity/Permission.php @@ -19,15 +19,6 @@ class Permission { */ private UuidInterface $id; - /** @ORM\Column(name="product_id", type="uuid_binary_ordered_time", nullable=true) */ - private ?UuidInterface $productId; - - /** - * @ORM\OneToOne(targetEntity="Template\Data\Business\Entity\Product") - * @ORM\JoinColumn(name="product_id", referencedColumnName="id", nullable=true) - */ - private ?Product $product; - /** @ORM\Column(name="identifier", type="string") */ private string $identifier; @@ -52,22 +43,6 @@ class Permission { return $this->id; } - public function getProductId(): ?UuidInterface { - return $this->productId; - } - - public function setProductId(?UuidInterface $productId): void { - $this->productId = $productId; - } - - public function getProduct(): ?Product { - return $this->product; - } - - public function setProduct(?Product $product): void { - $this->product = $product; - } - public function getIdentifier(): string { return $this->identifier; } diff --git a/src/DataDomain/Business/src/Entity/Role.php b/src/DataDomain/Business/src/Entity/Role.php index 8edeebe..f1a2428 100644 --- a/src/DataDomain/Business/src/Entity/Role.php +++ b/src/DataDomain/Business/src/Entity/Role.php @@ -20,15 +20,6 @@ class Role { */ private UuidInterface $id; - /** @ORM\Column(name="product_id", type="uuid_binary_ordered_time", nullable=true) */ - private ?UuidInterface $productId; - - /** - * @ORM\OneToOne(targetEntity="Template\Data\Business\Entity\Product") - * @ORM\JoinColumn(name="product_id", referencedColumnName="id", nullable=true) - */ - private ?Product $product; - /** @ORM\Column(name="identifier", type="string") */ private string $identifier; @@ -53,22 +44,6 @@ class Role { return $this->id; } - public function getProductId(): ?UuidInterface { - return $this->productId; - } - - public function setProductId(?UuidInterface $productId): void { - $this->productId = $productId; - } - - public function getProduct(): ?Product { - return $this->product; - } - - public function setProduct(?Product $product): void { - $this->product = $product; - } - public function getIdentifier(): string { return $this->identifier; } diff --git a/src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php b/src/DataDomain/Business/src/Factory/EntityManagerFactory.php similarity index 57% rename from src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php rename to src/DataDomain/Business/src/Factory/EntityManagerFactory.php index 5889a30..0ce0465 100644 --- a/src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php +++ b/src/DataDomain/Business/src/Factory/EntityManagerFactory.php @@ -4,15 +4,15 @@ declare(strict_types=1); namespace Template\Data\Business\Factory; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Laminas\ServiceManager\Factory\FactoryInterface; use Psr\Container\ContainerInterface; -class TemplateEntityManagerFactory implements FactoryInterface +class EntityManagerFactory implements FactoryInterface { - public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): TemplateEntityManager + public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): EntityManager { - return new TemplateEntityManager( + return new EntityManager( $container->get('doctrine.entity_manager.orm_template') ); } diff --git a/src/DataDomain/Business/src/Manager/TemplateEntityManager.php b/src/DataDomain/Business/src/Manager/EntityManager.php similarity index 65% rename from src/DataDomain/Business/src/Manager/TemplateEntityManager.php rename to src/DataDomain/Business/src/Manager/EntityManager.php index 9266142..75f4baa 100644 --- a/src/DataDomain/Business/src/Manager/TemplateEntityManager.php +++ b/src/DataDomain/Business/src/Manager/EntityManager.php @@ -6,6 +6,6 @@ namespace Template\Data\Business\Manager; use Doctrine\ORM\Decorator\EntityManagerDecorator; -class TemplateEntityManager extends EntityManagerDecorator +class EntityManager extends EntityManagerDecorator { } diff --git a/src/HandlingDomain/Product/config/service_manager.php b/src/HandlingDomain/Product/config/service_manager.php deleted file mode 100644 index e96bae3..0000000 --- a/src/HandlingDomain/Product/config/service_manager.php +++ /dev/null @@ -1,43 +0,0 @@ - [ - - /// Builder - ProductBuilder::class => AutoWiringFactory::class, - - /// Rule - ProductIdentifierAlreadyExistsRule::class => InjectionFactory::class, - - /// CQRS - // Product List - ProductListQueryHandler::class => InjectionFactory::class, - ProductListQueryBuilder::class => AutoWiringFactory::class, - - // Create Product - CreateProductCommandHandler::class => AutoWiringFactory::class, - CreateProductCommandBuilder::class => AutoWiringFactory::class, - - // Delete Product - DeleteProductCommandHandler::class => InjectionFactory::class, - DeleteProductCommandBuilder::class => AutoWiringFactory::class, - - // Update Product - UpdateProductCommandHandler::class => InjectionFactory::class, - UpdateProductCommandBuilder::class => AutoWiringFactory::class, - - ], -]; \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Builder/ProductBuilder.php b/src/HandlingDomain/Product/src/Builder/ProductBuilder.php deleted file mode 100644 index f79f0f1..0000000 --- a/src/HandlingDomain/Product/src/Builder/ProductBuilder.php +++ /dev/null @@ -1,23 +0,0 @@ -setIdentifier($identifier); - $product->setName($name); - $product->setUrl($url); - - return $product; - } -} \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/ConfigProvider.php b/src/HandlingDomain/Product/src/ConfigProvider.php deleted file mode 100644 index 2f68801..0000000 --- a/src/HandlingDomain/Product/src/ConfigProvider.php +++ /dev/null @@ -1,15 +0,0 @@ - require __DIR__ . '/./../config/service_manager.php', - ]; - } -} diff --git a/src/HandlingDomain/Product/src/Exception/ProductNotFoundByIdException.php b/src/HandlingDomain/Product/src/Exception/ProductNotFoundByIdException.php deleted file mode 100644 index c2ed05b..0000000 --- a/src/HandlingDomain/Product/src/Exception/ProductNotFoundByIdException.php +++ /dev/null @@ -1,27 +0,0 @@ -toString() - ), - ErrorDomain::Product, - ErrorCode::NotFound - ); - } -} - -?> \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Exception/ProductWithIdentifierAlreadyExists.php b/src/HandlingDomain/Product/src/Exception/ProductWithIdentifierAlreadyExists.php deleted file mode 100644 index 388020a..0000000 --- a/src/HandlingDomain/Product/src/Exception/ProductWithIdentifierAlreadyExists.php +++ /dev/null @@ -1,24 +0,0 @@ -identifier; - } - - public function getName(): ?string { - return $this->name; - } -} - -?> \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Handler/Command/CreateProduct/CreateProductCommandBuilder.php b/src/HandlingDomain/Product/src/Handler/Command/CreateProduct/CreateProductCommandBuilder.php deleted file mode 100644 index 0618d65..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/CreateProduct/CreateProductCommandBuilder.php +++ /dev/null @@ -1,17 +0,0 @@ -productIdentifierAlreadyExistsRule->appliesTo($command->getIdentifier()); - - $product = $this->builder->build( - identifier: $command->getIdentifier(), - name: $command->getName(), - url: null, - ); - - $this->entityManager->persist($product); - $this->entityManager->flush(); - - return $product; - } -} diff --git a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommand.php b/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommand.php deleted file mode 100644 index 736313e..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommand.php +++ /dev/null @@ -1,19 +0,0 @@ -id; - } -} - -?> \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandBuilder.php b/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandBuilder.php deleted file mode 100644 index 5d6301d..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandBuilder.php +++ /dev/null @@ -1,19 +0,0 @@ - \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandHandler.php b/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandHandler.php deleted file mode 100644 index 40a7398..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/DeleteProduct/DeleteProductCommandHandler.php +++ /dev/null @@ -1,39 +0,0 @@ -repository->find( - $command->getId() - ) ?? null; - - if ($product === null) { - throw new ProductNotFoundByIdException($command->getId()); - } - - $this->entityManager->remove($product); - $this->entityManager->flush(); - } -} diff --git a/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommand.php b/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommand.php deleted file mode 100644 index 265fe2a..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommand.php +++ /dev/null @@ -1,32 +0,0 @@ -id; - } - - public function getIdentifier(): string { - return $this->identifier; - } - - public function getName(): ?string { - return $this->name; - } - - public function getUrl(): ?string { - return $this->url; - } -} diff --git a/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommandBuilder.php b/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommandBuilder.php deleted file mode 100644 index fa006f8..0000000 --- a/src/HandlingDomain/Product/src/Handler/Command/UpdateProduct/UpdateProductCommandBuilder.php +++ /dev/null @@ -1,23 +0,0 @@ -getId(); - - /** @var Product $product */ - $product = $this->repository->find($id) ?? null; - if ($product === null) { - throw new ProductNotFoundByIdException($id); - } - - if ($product->getId()->toString() !== $command->getId()->toString()) { - $this->productIdentifierAlreadyExistsRule->appliesTo($command->getIdentifier()); - } - - $product->setIdentifier($command->getIdentifier()); - $product->setName($command->getName()); - $product->setUrl($command->getUrl()); - $product->setUpdatedAt(new DateTime()); - - $this->entityManager->persist($product); - $this->entityManager->flush(); - - return $product; - } -} diff --git a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQuery.php b/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQuery.php deleted file mode 100644 index de4e49f..0000000 --- a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQuery.php +++ /dev/null @@ -1,17 +0,0 @@ -query; - } -} - -?> \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryBuilder.php b/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryBuilder.php deleted file mode 100644 index a538e3e..0000000 --- a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryBuilder.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryHandler.php b/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryHandler.php deleted file mode 100644 index 6ed206f..0000000 --- a/src/HandlingDomain/Product/src/Handler/Query/ProductList/ProductListQueryHandler.php +++ /dev/null @@ -1,29 +0,0 @@ -repository->findAll(); - } -} - -?> \ No newline at end of file diff --git a/src/HandlingDomain/Product/src/Rule/ProductIdentifierAlreadyExistsRule.php b/src/HandlingDomain/Product/src/Rule/ProductIdentifierAlreadyExistsRule.php deleted file mode 100644 index 1a5ca36..0000000 --- a/src/HandlingDomain/Product/src/Rule/ProductIdentifierAlreadyExistsRule.php +++ /dev/null @@ -1,33 +0,0 @@ -productRepository->findOneBy([ - 'identifier' => $identifier - ]) ?? null; - - if ($product !== null) { - throw new ProductWithIdentifierAlreadyExists($identifier); - } - } -} \ No newline at end of file diff --git a/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/LoadRegistrationStep.php b/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/LoadRegistrationStep.php index 05a245d..0452172 100644 --- a/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/LoadRegistrationStep.php +++ b/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/LoadRegistrationStep.php @@ -15,7 +15,7 @@ class LoadRegistrationStep implements TaskInterface { /** * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\Registration" * ) */ diff --git a/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/SaveRegistrationAndUserStep.php b/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/SaveRegistrationAndUserStep.php index 7a25f3c..15c0e13 100644 --- a/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/SaveRegistrationAndUserStep.php +++ b/src/HandlingDomain/Registration/src/Pipeline/ConfirmRegistration/Step/SaveRegistrationAndUserStep.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace Template\Handling\Registration\Pipeline\ConfirmRegistration\Step; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use teewurst\Pipeline\PipelineInterface; use teewurst\Pipeline\TaskInterface; class SaveRegistrationAndUserStep implements TaskInterface { public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, ) { } diff --git a/src/HandlingDomain/Registration/src/Pipeline/RegisterUser/Step/SaveRegistrationStep.php b/src/HandlingDomain/Registration/src/Pipeline/RegisterUser/Step/SaveRegistrationStep.php index e136520..e2bfcd2 100644 --- a/src/HandlingDomain/Registration/src/Pipeline/RegisterUser/Step/SaveRegistrationStep.php +++ b/src/HandlingDomain/Registration/src/Pipeline/RegisterUser/Step/SaveRegistrationStep.php @@ -4,14 +4,14 @@ declare(strict_types=1); namespace Template\Handling\Registration\Pipeline\RegisterUser\Step; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use teewurst\Pipeline\PipelineInterface; use teewurst\Pipeline\TaskInterface; class SaveRegistrationStep implements TaskInterface { public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, ) { } diff --git a/src/HandlingDomain/Registration/src/Rule/RegistrationWithIdentifierAlreadyExistsRule.php b/src/HandlingDomain/Registration/src/Rule/RegistrationWithIdentifierAlreadyExistsRule.php index 5332ffd..43b82e6 100644 --- a/src/HandlingDomain/Registration/src/Rule/RegistrationWithIdentifierAlreadyExistsRule.php +++ b/src/HandlingDomain/Registration/src/Rule/RegistrationWithIdentifierAlreadyExistsRule.php @@ -10,7 +10,7 @@ class RegistrationWithIdentifierAlreadyExistsRule { /** * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\Registration" * ) */ diff --git a/src/HandlingDomain/User/src/Builder/UserBuilder.php b/src/HandlingDomain/User/src/Builder/UserBuilder.php index 7bff380..a5c6f5b 100644 --- a/src/HandlingDomain/User/src/Builder/UserBuilder.php +++ b/src/HandlingDomain/User/src/Builder/UserBuilder.php @@ -14,7 +14,7 @@ class UserBuilder { /** * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\Role" * ) * @Inject("Template\Infrastructure\Encryption\Client\EncryptionClient") diff --git a/src/HandlingDomain/User/src/Handler/Command/ChangePassword/ChangePasswordCommandHandler.php b/src/HandlingDomain/User/src/Handler/Command/ChangePassword/ChangePasswordCommandHandler.php index 0e936d7..b1117b0 100644 --- a/src/HandlingDomain/User/src/Handler/Command/ChangePassword/ChangePasswordCommandHandler.php +++ b/src/HandlingDomain/User/src/Handler/Command/ChangePassword/ChangePasswordCommandHandler.php @@ -7,7 +7,7 @@ use Template\Data\Business\Repository\RoleRepository; use Template\Data\Business\Repository\UserRepository; use Template\Handling\User\Exception\UserNotFoundByIdentifierException; use Template\Handling\User\Exception\UserWrongPasswordException; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Template\Infrastructure\Encryption\Client\EncryptionClient; use Reinfi\DependencyInjection\Annotation\Inject; use Reinfi\DependencyInjection\Annotation\InjectDoctrineRepository; @@ -15,7 +15,7 @@ use Reinfi\DependencyInjection\Annotation\InjectDoctrineRepository; class ChangePasswordCommandHandler { public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly EncryptionClient $encryptionClient ) { } diff --git a/src/HandlingDomain/User/src/Handler/Command/ChangeUsername/ChangeUsernameCommandHandler.php b/src/HandlingDomain/User/src/Handler/Command/ChangeUsername/ChangeUsernameCommandHandler.php index 4c794cc..0da209e 100644 --- a/src/HandlingDomain/User/src/Handler/Command/ChangeUsername/ChangeUsernameCommandHandler.php +++ b/src/HandlingDomain/User/src/Handler/Command/ChangeUsername/ChangeUsernameCommandHandler.php @@ -3,13 +3,13 @@ namespace Template\Handling\User\Handler\Command\ChangeUsername; use Template\Handling\User\Exception\UserWrongPasswordException; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Template\Infrastructure\Encryption\Client\EncryptionClient; class ChangeUsernameCommandHandler { public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly EncryptionClient $encryptionClient ) { } diff --git a/src/HandlingDomain/User/src/Handler/Command/CreateUser/CreateUserCommandHandler.php b/src/HandlingDomain/User/src/Handler/Command/CreateUser/CreateUserCommandHandler.php index c470528..cfa41e1 100644 --- a/src/HandlingDomain/User/src/Handler/Command/CreateUser/CreateUserCommandHandler.php +++ b/src/HandlingDomain/User/src/Handler/Command/CreateUser/CreateUserCommandHandler.php @@ -5,13 +5,13 @@ namespace Template\Handling\User\Handler\Command\CreateUser; use Template\Data\Business\Entity\User; use Template\Handling\User\Builder\UserBuilder; use Template\Handling\User\Rule\UserWithIdentifierAlreadyExistsRule; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Reinfi\DependencyInjection\Annotation\Inject; class CreateUserCommandHandler { public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly UserBuilder $builder, private readonly UserWithIdentifierAlreadyExistsRule $userWithIdentifierAlreadyExistsRule ) { diff --git a/src/HandlingDomain/User/src/Rule/UserWithIdentifierAlreadyExistsRule.php b/src/HandlingDomain/User/src/Rule/UserWithIdentifierAlreadyExistsRule.php index c53f5dd..70b186a 100644 --- a/src/HandlingDomain/User/src/Rule/UserWithIdentifierAlreadyExistsRule.php +++ b/src/HandlingDomain/User/src/Rule/UserWithIdentifierAlreadyExistsRule.php @@ -10,7 +10,7 @@ class UserWithIdentifierAlreadyExistsRule { /** * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\User" * ) */ diff --git a/src/HandlingDomain/UserSession/src/Handler/Command/LoginUser/LoginUserCommandHandler.php b/src/HandlingDomain/UserSession/src/Handler/Command/LoginUser/LoginUserCommandHandler.php index a73dcbd..142b636 100644 --- a/src/HandlingDomain/UserSession/src/Handler/Command/LoginUser/LoginUserCommandHandler.php +++ b/src/HandlingDomain/UserSession/src/Handler/Command/LoginUser/LoginUserCommandHandler.php @@ -9,26 +9,26 @@ use Template\Data\Business\Repository\UserSessionRepository; use Template\Handling\User\Exception\UserNotFoundByIdentifierException; use Template\Handling\User\Exception\UserWrongPasswordException; use Template\Handling\UserSession\Rule\UserPasswordMatchesRule; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Reinfi\DependencyInjection\Annotation\Inject; use Reinfi\DependencyInjection\Annotation\InjectDoctrineRepository; class LoginUserCommandHandler { /** - * @Inject("Template\Data\Business\Manager\TemplateEntityManager") + * @Inject("Template\Data\Business\Manager\EntityManager") * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\User" * ) * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\UserSession" * ) * @Inject("Template\Handling\UserSession\Rule\UserPasswordMatchesRule") */ public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly UserRepository $userRepository, private readonly UserSessionRepository $userSessionRepository, private readonly UserPasswordMatchesRule $passwordMatchesRule diff --git a/src/HandlingDomain/UserSession/src/Handler/Command/LogoutUser/LogoutUserCommandHandler.php b/src/HandlingDomain/UserSession/src/Handler/Command/LogoutUser/LogoutUserCommandHandler.php index 81b0534..319e0af 100644 --- a/src/HandlingDomain/UserSession/src/Handler/Command/LogoutUser/LogoutUserCommandHandler.php +++ b/src/HandlingDomain/UserSession/src/Handler/Command/LogoutUser/LogoutUserCommandHandler.php @@ -4,7 +4,7 @@ namespace Template\Handling\UserSession\Handler\Command\LogoutUser; use Template\Data\Business\Entity\UserSession; use Template\Data\Business\Repository\UserSessionRepository; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Reinfi\DependencyInjection\Annotation\Inject; use Reinfi\DependencyInjection\Annotation\InjectDoctrineRepository; @@ -12,14 +12,14 @@ class LogoutUserCommandHandler { /** - * @Inject("Template\Data\Business\Manager\TemplateEntityManager") + * @Inject("Template\Data\Business\Manager\EntityManager") * @InjectDoctrineRepository( - * entityManager="Template\Data\Business\Manager\TemplateEntityManager", + * entityManager="Template\Data\Business\Manager\EntityManager", * entity="Template\Data\Business\Entity\UserSession" * ) */ public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly UserSessionRepository $userSessionRepository ) { } diff --git a/src/Infrastructure/Session/src/Middleware/SessionMiddleware.php b/src/Infrastructure/Session/src/Middleware/SessionMiddleware.php index dfd71bd..7ff4a47 100644 --- a/src/Infrastructure/Session/src/Middleware/SessionMiddleware.php +++ b/src/Infrastructure/Session/src/Middleware/SessionMiddleware.php @@ -5,7 +5,7 @@ namespace Template\Infrastructure\Session\Middleware; use Template\Data\Business\Entity\UserSession; use Template\Data\Business\Repository\UserSessionRepository; use Template\Handling\UserSession\Builder\UserSessionBuilder; -use Template\Data\Business\Manager\TemplateEntityManager; +use Template\Data\Business\Manager\EntityManager; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; @@ -19,7 +19,7 @@ class SessionMiddleware implements MiddlewareInterface private readonly UserSessionRepository $userSessionRepository; public function __construct( - private readonly TemplateEntityManager $entityManager, + private readonly EntityManager $entityManager, private readonly UserSessionBuilder $userSessionBuilder, ) { $this->userSessionRepository = $this->entityManager->getRepository(UserSession::class);