Merge pull request #14 from irontec/namespace-enhancement

Move application services to domain

Application/Service/DataGateway.php

@@ -3,11 +3,12 @@
 namespace Ivoz\Core\Application\Service;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\Event\CommandWasExecuted;
-use Ivoz\Core\Application\RequestId;
-use Ivoz\Core\Application\Service\Assembler\DtoAssembler;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\Event\CommandWasExecuted;
+use Ivoz\Core\Domain\RequestId;
+use Ivoz\Core\Domain\Service\Assembler\DtoAssembler;
 use Ivoz\Core\Domain\Service\DomainEventPublisher;
+use Ivoz\Core\Domain\Service\QueryBuilderFactory;
 use Ivoz\Core\Infrastructure\Domain\Service\DoctrineEntityPersister;
 
 /**
@@ -52,9 +53,6 @@ class DataGateway
      */
     public static $user = '';
 
-    /**
-     * DataGateway constructor.
-     */
     public function __construct(
         EntityManagerInterface $entityManager,
         QueryBuilderFactory $queryBuilderFactory,

Application/DataTransferObjectInterface.php → Domain/DataTransferObjectInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application;
+namespace Ivoz\Core\Domain;
 
 interface DataTransferObjectInterface
 {

Application/Event/CommandEventInterface.php → Domain/Event/CommandEventInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Event;
+namespace Ivoz\Core\Domain\Event;
 
 use Ivoz\Core\Domain\Event\DomainEventInterface;
 

Application/Event/CommandWasExecuted.php → Domain/Event/CommandWasExecuted.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Event;
+namespace Ivoz\Core\Domain\Event;
 
 use Ramsey\Uuid\Uuid;
 

Application/ForeignKeyTransformerInterface.php → Domain/ForeignKeyTransformerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application;
+namespace Ivoz\Core\Domain;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Ivoz\Core\Domain\Model\EntityInterface;

Application/Helper/ArrayObjectHelper.php → Domain/Helper/ArrayObjectHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Helper;
+namespace Ivoz\Core\Domain\Helper;
 
 class ArrayObjectHelper
 {

Application/Helper/EntityClassHelper.php → Domain/Helper/EntityClassHelper.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Ivoz\Core\Application\Helper;
+namespace Ivoz\Core\Domain\Helper;
 
 use Doctrine\Persistence\Proxy;
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 use Ivoz\Core\Domain\Model\EntityInterface;
 
 class EntityClassHelper

Application/Helper/LifecycleServiceHelper.php → Domain/Helper/LifecycleServiceHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Helper;
+namespace Ivoz\Core\Domain\Helper;
 
 use Doctrine\Common\Inflector\Inflector;
 use Ivoz\Core\Domain\Model\EntityInterface;

Domain/Model/Changelog/ChangelogAbstract.php

@@ -5,10 +5,10 @@
 namespace Ivoz\Core\Domain\Model\Changelog;
 
 use Assert\Assertion;
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 use Ivoz\Core\Domain\Model\ChangelogTrait;
 use Ivoz\Core\Domain\Model\EntityInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 use Ivoz\Core\Domain\Model\Helper\DateTimeHelper;
 use Ivoz\Core\Domain\Model\Commandlog\CommandlogInterface;
 use Ivoz\Core\Domain\Model\Commandlog\Commandlog;

Domain/Model/Changelog/ChangelogDtoAbstract.php

@@ -2,8 +2,8 @@
 
 namespace Ivoz\Core\Domain\Model\Changelog;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\Model\DtoNormalizer;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\Model\DtoNormalizer;
 use Ivoz\Core\Domain\Model\Commandlog\CommandlogDto;
 
 /**

Domain/Model/Changelog/ChangelogInterface.php

@@ -5,8 +5,8 @@
 use Ivoz\Core\Domain\Model\EntityInterface;
 use Ivoz\Core\Domain\Event\EntityEventInterface;
 use Ivoz\Core\Domain\Model\Commandlog\CommandlogInterface;
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 
 /**
 * ChangelogInterface

Domain/Model/Changelog/ChangelogTrait.php

@@ -4,8 +4,8 @@
 
 namespace Ivoz\Core\Domain\Model\Changelog;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 
 /**
 * @codeCoverageIgnore

Domain/Model/ChangelogTrait.php

@@ -2,7 +2,7 @@
 
 namespace Ivoz\Core\Domain\Model;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 
 trait ChangelogTrait
 {

Domain/Model/Commandlog/Commandlog.php

@@ -2,7 +2,7 @@
 
 namespace Ivoz\Core\Domain\Model\Commandlog;
 
-use Ivoz\Core\Application\Event\CommandEventInterface;
+use Ivoz\Core\Domain\Event\CommandEventInterface;
 use Ivoz\Core\Domain\Model\LoggerEntityInterface;
 
 class Commandlog extends CommandlogAbstract implements LoggerEntityInterface, CommandlogInterface
@@ -20,7 +20,7 @@ public function getId(): ?string
     }
 
     /**
-     * @param \Ivoz\Core\Application\Event\CommandEventInterface $event
+     * @param \Ivoz\Core\Domain\Event\CommandEventInterface $event
      * @return self
      */
     public static function fromEvent(CommandEventInterface $event)

Domain/Model/Commandlog/CommandlogAbstract.php

@@ -5,10 +5,10 @@
 namespace Ivoz\Core\Domain\Model\Commandlog;
 
 use Assert\Assertion;
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 use Ivoz\Core\Domain\Model\ChangelogTrait;
 use Ivoz\Core\Domain\Model\EntityInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 use Ivoz\Core\Domain\Model\Helper\DateTimeHelper;
 
 /**

Domain/Model/Commandlog/CommandlogDtoAbstract.php

@@ -2,8 +2,8 @@
 
 namespace Ivoz\Core\Domain\Model\Commandlog;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\Model\DtoNormalizer;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\Model\DtoNormalizer;
 
 /**
 * CommandlogDtoAbstract

Domain/Model/Commandlog/CommandlogInterface.php

@@ -3,9 +3,9 @@
 namespace Ivoz\Core\Domain\Model\Commandlog;
 
 use Ivoz\Core\Domain\Model\EntityInterface;
-use Ivoz\Core\Application\Event\CommandEventInterface;
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\Event\CommandEventInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 
 /**
 * CommandlogInterface
@@ -20,7 +20,7 @@ interface CommandlogInterface extends EntityInterface
     public function getId(): ?string;
 
     /**
-     * @param \Ivoz\Core\Application\Event\CommandEventInterface $event
+     * @param \Ivoz\Core\Domain\Event\CommandEventInterface $event
      * @return self
      */
     public static function fromEvent(CommandEventInterface $event);

Domain/Model/Commandlog/CommandlogTrait.php

@@ -4,8 +4,8 @@
 
 namespace Ivoz\Core\Domain\Model\Commandlog;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 
 /**
 * @codeCoverageIgnore

Application/Model/DtoNormalizer.php → Domain/Model/DtoNormalizer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Model;
+namespace Ivoz\Core\Domain\Model;
 
 trait DtoNormalizer
 {

Domain/Model/EntityInterface.php

@@ -2,8 +2,8 @@
 
 namespace Ivoz\Core\Domain\Model;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 
 /**
  * Entity interface

Application/MutexInterface.php → Domain/MutexInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application;
+namespace Ivoz\Core\Domain;
 
 interface MutexInterface
 {

Application/RegisterCommandTrait.php → Domain/RegisterCommandTrait.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Ivoz\Core\Application;
+namespace Ivoz\Core\Domain;
 
-use Ivoz\Core\Application\Event\CommandWasExecuted;
+use Ivoz\Core\Domain\Event\CommandWasExecuted;
 use Ivoz\Core\Domain\Service\DomainEventPublisher;
 
 trait RegisterCommandTrait

Application/RequestId.php → Domain/RequestId.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application;
+namespace Ivoz\Core\Domain;
 
 use Ramsey\Uuid\Uuid;
 

Application/Service/Assembler/CustomDtoAssemblerInterface.php → Domain/Service/Assembler/CustomDtoAssemblerInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Ivoz\Core\Application\Service\Assembler;
+namespace Ivoz\Core\Domain\Service\Assembler;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 use Ivoz\Core\Domain\Model\EntityInterface;
 
 interface CustomDtoAssemblerInterface

Application/Service/Assembler/CustomEntityAssemblerInterface.php → Domain/Service/Assembler/CustomEntityAssemblerInterface.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Ivoz\Core\Application\Service\Assembler;
+namespace Ivoz\Core\Domain\Service\Assembler;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 use Ivoz\Core\Domain\Model\EntityInterface;
 
 interface CustomEntityAssemblerInterface

Application/Service/Assembler/DtoAssembler.php → Domain/Service/Assembler/DtoAssembler.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Ivoz\Core\Application\Service\Assembler;
+namespace Ivoz\Core\Domain\Service\Assembler;
 
-use Ivoz\Core\Application\Helper\EntityClassHelper;
+use Ivoz\Core\Domain\Helper\EntityClassHelper;
 use Ivoz\Core\Domain\Model\EntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

Application/Service/Assembler/EntityAssembler.php → Domain/Service/Assembler/EntityAssembler.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Ivoz\Core\Application\Service\Assembler;
+namespace Ivoz\Core\Domain\Service\Assembler;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\ForeignKeyTransformerInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\ForeignKeyTransformerInterface;
 use Ivoz\Core\Domain\Model\EntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -92,7 +92,7 @@ private function getAssembler(DataTransferObjectInterface $dto)
 
     /**
      * @param DataTransferObjectInterface $dto
-     * @return \Ivoz\Core\Application\Service\Assembler\CustomEntityAssemblerInterface | null
+     * @return \Ivoz\Core\Domain\Service\Assembler\CustomEntityAssemblerInterface | null
      */
     private function create(DataTransferObjectInterface $dto)
     {
@@ -118,7 +118,7 @@ private function getServiceNameByDto(DataTransferObjectInterface $dto)
             substr(
                 str_replace(
                     'Domain\\Model',
-                    'Application\\Service',
+                    'Domain\\Assembler',
                     $entityClass
                 ),
                 0,

Application/Service/CommandEventSubscriber.php → Domain/Service/CommandEventSubscriber.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Ivoz\Core\Application\Service;
+namespace Ivoz\Core\Domain\Service;
 
-use Ivoz\Core\Application\Event\CommandEventInterface;
+use Ivoz\Core\Domain\Event\CommandEventInterface;
 use Ivoz\Core\Domain\Event\DomainEventInterface;
 use Ivoz\Core\Domain\Service\DomainEventSubscriberInterface;
 

Application/Service/CommonStoragePathResolver.php → Domain/Service/CommonStoragePathResolver.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Service;
+namespace Ivoz\Core\Domain\Service;
 
 use Ivoz\Core\Domain\Model\EntityInterface;
 

Application/Service/CreateEntityFromDto.php → Domain/Service/CreateEntityFromDto.php

@@ -6,10 +6,10 @@
  * Time: 10:52
  */
 
-namespace Ivoz\Core\Application\Service;
+namespace Ivoz\Core\Domain\Service;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\Service\Assembler\EntityAssembler;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\Service\Assembler\EntityAssembler;
 use Ivoz\Core\Domain\Model\EntityInterface;
 
 /**

Domain/Service/EntityPersisterInterface.php

@@ -2,7 +2,7 @@
 
 namespace Ivoz\Core\Domain\Service;
 
-use Ivoz\Core\Application\DataTransferObjectInterface;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
 use Ivoz\Core\Domain\Model\EntityInterface;
 
 interface EntityPersisterInterface

Application/Service/EntityTools.php → Domain/Service/EntityTools.php

@@ -1,13 +1,14 @@
 <?php
 
-namespace Ivoz\Core\Application\Service;
+namespace Ivoz\Core\Domain\Service;
 
 use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\PessimisticLockException;
-use Ivoz\Core\Application\DataTransferObjectInterface;
-use Ivoz\Core\Application\Service\Assembler\DtoAssembler;
+use Ivoz\Core\Domain\DataTransferObjectInterface;
+use Ivoz\Core\Domain\Service\Assembler\DtoAssembler;
 use Ivoz\Core\Domain\Model\EntityInterface;
 use Ivoz\Core\Domain\Service\EntityPersisterInterface;
 use Doctrine\ORM\UnitOfWork;

Application/Service/QueryBuilderFactory.php → Domain/Service/QueryBuilderFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Ivoz\Core\Application\Service;
+namespace Ivoz\Core\Domain\Service;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;