diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml
new file mode 100644
index 0000000..adc3107
--- /dev/null
+++ b/.github/workflows/check-dependencies.yml
@@ -0,0 +1,27 @@
+name: "Check dependencies"
+
+on: ["pull_request", "push"]
+
+jobs:
+ check-dependencies:
+ name: "Check dependencies"
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Validate composer.json and composer.lock
+ run: composer validate --strict
+
+ - name: Cache Composer packages
+ id: composer-cache
+ uses: actions/cache@v2
+ with:
+ path: vendor
+ key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-php-
+
+ - name: Install dependencies
+ run: composer install --prefer-dist --no-progress
\ No newline at end of file
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
new file mode 100644
index 0000000..868d187
--- /dev/null
+++ b/.github/workflows/static-analysis.yml
@@ -0,0 +1,26 @@
+name: "Static analysis"
+
+on: ["pull_request", "push"]
+
+jobs:
+ static-analysis:
+ name: "static analysis"
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: "checkout"
+ uses: "actions/checkout@v2"
+
+ - name: "installing PHP"
+ uses: "shivammathur/setup-php@v2"
+ with:
+ php-version: "8.0"
+ ini-values: memory_limit=-1
+ tools: composer:v2, cs2pr
+ extensions: bcmath, mbstring, intl, sodium, json
+
+ - name: "installing dependencies"
+ run: "composer update --no-interaction --no-progress"
+
+ - name: "running static analysis ( psalm )"
+ run: "vendor/bin/psalm --output-format=github --shepherd --stats"
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 4186604..500edb0 100644
--- a/composer.json
+++ b/composer.json
@@ -46,6 +46,8 @@
},
"autoload-dev": {
"psr-4": {
+ "Tests\\Unit\\DDDStarterPack\\": "tests/Unit/DDDStarterPack/",
+ "Tests\\Integration\\DDDStarterPack\\": "tests/Integration/DDDStarterPack/",
"Tests\\DDDStarterPack\\": "tests/DDDStarterPack/",
"Tests\\Learning\\": "tests/Learning/",
"Tests\\Support\\": "tests/Support/",
diff --git a/doc/aggregate.md b/doc/aggregate.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/command.md b/doc/command.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/data_transformer.md b/doc/data_transformer.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/event.md b/doc/event.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/excpetion.md b/doc/excpetion.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/message.md b/doc/message.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/service.md b/doc/service.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/util.md b/doc/util.md
new file mode 100644
index 0000000..e69de29
diff --git a/psalm.xml b/psalm.xml
index c330210..4059275 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/readme.md b/readme.md
index f71c843..ba6cf0e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,12 @@
DDD Starter Pack
=====
+![check dependencies](https://github.com/matiux/ddd-starter-pack/actions/workflows/check-dependencies.yml/badge.svg)
+![test](https://github.com/matiux/ddd-starter-pack/actions/workflows/test.yml/badge.svg)
+[![codecov](https://codecov.io/gh/matiux/ddd-starter-pack/branch/develop/graph/badge.svg)](https://codecov.io/gh/matiux/ddd-starter-pack)
+[![type coverage](https://shepherd.dev/github/matiux/ddd-starter-pack/coverage.svg)](https://shepherd.dev/github/matiux/ddd-starter-pack)
+[![psalm level](https://shepherd.dev/github/matiux/ddd-starter-pack/level.svg)](https://shepherd.dev/github/matiux/ddd-starter-pack)
+
Questa libreria contiene "concetti" per lo sviluppo di micro servizi basati su architettura esagonale e DDD.
* Ramo v2: PHP < 8.0
@@ -24,11 +30,16 @@ composer install
## test
Eseguire l'alias `test`
-#### Concetti sviluppati
+#### Moduli
-* [Domain](doc/domain.md)
-* [Application](doc/application.md)
-* [Infrastructure](doc/infrastructure.md)
+* [Aggregate](doc/aggregate.md)
+* [Command](doc/command.md)
+* [Data transformer](doc/data_transformer.md)
+* [Event](doc/event.md)
+* [Exception](doc/excpetion.md)
+* [Message](doc/message.md)
+* [Service](doc/service.md)
+* [Util](doc/util.md)
#### TODO
* Prendere spunto da questi progetti per la gestione degli eventi nei modelli di dominio
diff --git a/scripts/git-hooks/pre-commit-functions.sh b/scripts/git-hooks/pre-commit-functions.sh
index e454a44..cadc52a 100755
--- a/scripts/git-hooks/pre-commit-functions.sh
+++ b/scripts/git-hooks/pre-commit-functions.sh
@@ -32,7 +32,6 @@ check_psalm() {
if [[ "$STATUS" -eq 0 ]]; then
echo -e "\e[42mPHP Static Analysis is OK\e[m"
- ./dc badge "static analysis" passed psalm
return 0 # true
fi
@@ -50,12 +49,11 @@ check_psalm() {
check_phpunit() {
# Esecuzione dei tests con phpunit
- ./dc phpunit --testdox --exclude-group learning -vvv
+ ./dc phpunit --testdox --colors=always --exclude-group learning -vvv
STATUS=$?
if [[ "$STATUS" -eq 0 ]]; then
echo -e "\e[42mPHP Unit Tests Suite is OK\e[m"
- ./dc badge test passed phpunit
return 0 # true
fi
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/BasicEntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/BasicEntityId.php
similarity index 97%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/BasicEntityId.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/BasicEntityId.php
index e6723f4..88c539b 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/BasicEntityId.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/BasicEntityId.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
use Exception;
use InvalidArgumentException;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/DomainCollection.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/DomainCollection.php
similarity index 97%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/DomainCollection.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/DomainCollection.php
index 3b91f67..e4a5892 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/DomainCollection.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/DomainCollection.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
use Countable;
use Iterator;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/EntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/EntityId.php
similarity index 89%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/EntityId.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/EntityId.php
index 638ab76..9a41a60 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/EntityId.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/EntityId.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
interface EntityId
{
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/IdentifiableDomainObject.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/IdentifiableDomainObject.php
similarity index 80%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/IdentifiableDomainObject.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/IdentifiableDomainObject.php
index 996f108..f5ba4da 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/IdentifiableDomainObject.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/IdentifiableDomainObject.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
/**
* @template T of BasicEntityId
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/LoggableDomainObject.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/LoggableDomainObject.php
similarity index 87%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/LoggableDomainObject.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/LoggableDomainObject.php
index ef19083..a93c267 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/LoggableDomainObject.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/LoggableDomainObject.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
use DateTimeImmutable;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/LoggingInfo.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/LoggingInfo.php
similarity index 93%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/LoggingInfo.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/LoggingInfo.php
index 4e76b21..b997629 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/LoggingInfo.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/LoggingInfo.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate;
+namespace DDDStarterPack\Aggregate\Domain;
use DateTime;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParams.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParams.php
similarity index 96%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParams.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParams.php
index 731e0e9..3388116 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParams.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParams.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Filter;
use InvalidArgumentException;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsApplier.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsApplier.php
similarity index 85%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsApplier.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsApplier.php
index 978da45..2a09c1e 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsApplier.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsApplier.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Filter;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilder.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilder.php
similarity index 93%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilder.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilder.php
index d5813ce..ec5187d 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilder.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilder.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Filter;
use InvalidArgumentException;
use LogicException;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/PaginationFilterParamsApplierKeys.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/PaginationFilterParamsApplierKeys.php
similarity index 71%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/PaginationFilterParamsApplierKeys.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/PaginationFilterParamsApplierKeys.php
index 795dae8..0af4093 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/PaginationFilterParamsApplierKeys.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/PaginationFilterParamsApplierKeys.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Filter;
interface PaginationFilterParamsApplierKeys
{
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/SortingFilterParamsApplierKeys.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/SortingFilterParamsApplierKeys.php
similarity index 73%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/SortingFilterParamsApplierKeys.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/SortingFilterParamsApplierKeys.php
index 418e9b7..1c83028 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Filter/SortingFilterParamsApplierKeys.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Filter/SortingFilterParamsApplierKeys.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Filter;
interface SortingFilterParamsApplierKeys
{
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepository.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepository.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepository.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepository.php
index 11ab5ae..7ce9c17 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepository.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepository.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository;
+namespace DDDStarterPack\Aggregate\Domain\Repository;
/**
* @template E
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/AbstractPaginator.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/AbstractPaginator.php
similarity index 96%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/AbstractPaginator.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/AbstractPaginator.php
index cd04717..bf5e488 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/AbstractPaginator.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/AbstractPaginator.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Paginator;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Paginator;
use ArrayIterator;
use ArrayObject;
diff --git a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/Paginator.php b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/Paginator.php
similarity index 88%
rename from src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/Paginator.php
rename to src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/Paginator.php
index c4a9081..008839a 100644
--- a/src/Matiux/DDDStarterPack/Domain/Aggregate/Repository/Paginator/Paginator.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Domain/Repository/Paginator/Paginator.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Aggregate\Repository\Paginator;
+namespace DDDStarterPack\Aggregate\Domain\Repository\Paginator;
use Countable;
use Iterator;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/DoctrineEntityId.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/DoctrineEntityId.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/DoctrineEntityId.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/DoctrineEntityId.php
index 8178e2b..94c46c0 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/DoctrineEntityId.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/DoctrineEntityId.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine;
-use DDDStarterPack\Domain\Aggregate\BasicEntityId;
-use DDDStarterPack\Domain\Aggregate\EntityId;
+use DDDStarterPack\Aggregate\Domain\BasicEntityId;
+use DDDStarterPack\Aggregate\Domain\EntityId;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\GuidType;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineFilterParamsRepository.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineFilterParamsRepository.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineFilterParamsRepository.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineFilterParamsRepository.php
index 1230cf4..9a3c79d 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineFilterParamsRepository.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineFilterParamsRepository.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
-use DDDStarterPack\Domain\Aggregate\Repository\Paginator\Paginator;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Paginator\Paginator;
use Doctrine\ORM\QueryBuilder;
use Webmozart\Assert\Assert;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrinePaginationRepository.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrinePaginationRepository.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrinePaginationRepository.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrinePaginationRepository.php
index bce0ffe..fa3e399 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrinePaginationRepository.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrinePaginationRepository.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository;
use Doctrine\ORM\QueryBuilder;
use Webmozart\Assert\Assert;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineRepository.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineRepository.php
similarity index 91%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineRepository.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineRepository.php
index 9bd332b..fd492ea 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/DoctrineRepository.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/DoctrineRepository.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository;
use Doctrine\Bundle\DoctrineBundle\Registry;
use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php
similarity index 64%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php
index 47f1523..f521e92 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineFilterParamsApplier.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsApplier;
use Doctrine\ORM\QueryBuilder;
/**
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php
index 46bf25a..0d7a5f1 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericPaginationApplier.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
use Doctrine\ORM\QueryBuilder;
abstract class DoctrineGenericPaginationApplier extends DoctrineFilterParamsApplier
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php
similarity index 88%
rename from src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php
rename to src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php
index fe673d0..08a3290 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php
+++ b/src/Matiux/DDDStarterPack/Aggregate/Infrastructure/Doctrine/Repository/Filter/DoctrineGenericSortApplier.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
+namespace DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
use Doctrine\ORM\QueryBuilder;
use LogicException;
diff --git a/src/Matiux/DDDStarterPack/Application/Exception/ApplicationException.php b/src/Matiux/DDDStarterPack/Application/Exception/ApplicationException.php
deleted file mode 100644
index db700f3..0000000
--- a/src/Matiux/DDDStarterPack/Application/Exception/ApplicationException.php
+++ /dev/null
@@ -1,11 +0,0 @@
- No buono parlare di infrastruttura qui
return match ($configuration->getDriverName()) {
SQSMessageConsumer::NAME => new SQSMessageConsumer(new AWSMessageFactory()),
default => throw new RuntimeException(sprintf('Invalid driver name [%s]', $configuration->getDriverName())),
diff --git a/src/Matiux/DDDStarterPack/Application/Message/Factory/MessageProducerFactory.php b/src/Matiux/DDDStarterPack/Message/Application/Factory/MessageProducerFactory.php
similarity index 69%
rename from src/Matiux/DDDStarterPack/Application/Message/Factory/MessageProducerFactory.php
rename to src/Matiux/DDDStarterPack/Message/Application/Factory/MessageProducerFactory.php
index ba243c3..fcd54bb 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/Factory/MessageProducerFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/Factory/MessageProducerFactory.php
@@ -2,13 +2,13 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message\Factory;
+namespace DDDStarterPack\Message\Application\Factory;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Application\Message\MessageProducer;
-use DDDStarterPack\Application\Message\MessageProducerConnector;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\SNSMessagePubblisher;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\SQSMessageProducer;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Application\MessageProducer;
+use DDDStarterPack\Message\Application\MessageProducerConnector;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\SNSMessagePubblisher;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\SQSMessageProducer;
use RuntimeException;
class MessageProducerFactory
diff --git a/src/Matiux/DDDStarterPack/Application/Message/Message.php b/src/Matiux/DDDStarterPack/Message/Application/Message.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Application/Message/Message.php
rename to src/Matiux/DDDStarterPack/Message/Application/Message.php
index bc1b346..9859b0e 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/Message.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/Message.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
use DateTimeImmutable;
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageConsumer.php b/src/Matiux/DDDStarterPack/Message/Application/MessageConsumer.php
similarity index 89%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageConsumer.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageConsumer.php
index ab00321..2e54098 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageConsumer.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageConsumer.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
use ArrayObject;
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageConsumerConnector.php b/src/Matiux/DDDStarterPack/Message/Application/MessageConsumerConnector.php
similarity index 65%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageConsumerConnector.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageConsumerConnector.php
index 121aa2c..f558b35 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageConsumerConnector.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageConsumerConnector.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
interface MessageConsumerConnector extends MessageConsumer
{
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageFactory.php b/src/Matiux/DDDStarterPack/Message/Application/MessageFactory.php
similarity index 92%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageFactory.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageFactory.php
index 88a882c..42e2cd0 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageFactory.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
use DateTimeImmutable;
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageProducer.php b/src/Matiux/DDDStarterPack/Message/Application/MessageProducer.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageProducer.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageProducer.php
index f3c1d98..acdd2ca 100755
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageProducer.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageProducer.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
-use DDDStarterPack\Application\Message\Exception\MessageInvalidException;
+use DDDStarterPack\Message\Application\Exception\MessageInvalidException;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerConnector.php b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerConnector.php
similarity index 70%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageProducerConnector.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageProducerConnector.php
index 6859189..c8af634 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerConnector.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerConnector.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponse.php b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponse.php
similarity index 85%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponse.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponse.php
index ff52443..4807ed4 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponse.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponse.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
interface MessageProducerResponse
{
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponseFactory.php b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponseFactory.php
similarity index 87%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponseFactory.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponseFactory.php
index bcb28a2..be08e19 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageProducerResponseFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageProducerResponseFactory.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Application/Message/MessageService.php b/src/Matiux/DDDStarterPack/Message/Application/MessageService.php
similarity index 79%
rename from src/Matiux/DDDStarterPack/Application/Message/MessageService.php
rename to src/Matiux/DDDStarterPack/Message/Application/MessageService.php
index 5a5f847..5e69cae 100644
--- a/src/Matiux/DDDStarterPack/Application/Message/MessageService.php
+++ b/src/Matiux/DDDStarterPack/Message/Application/MessageService.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Message;
+namespace DDDStarterPack\Message\Application;
interface MessageService
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSBasicService.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSBasicService.php
similarity index 95%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSBasicService.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSBasicService.php
index 70609eb..155b4b9 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSBasicService.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSBasicService.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS;
+namespace DDDStarterPack\Message\Infrastructure\AWS;
use Aws\Credentials\Credentials;
use Aws\Result;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessage.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessage.php
similarity index 88%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessage.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessage.php
index 6bcdfa0..093d024 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessage.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessage.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS;
+namespace DDDStarterPack\Message\Infrastructure\AWS;
use BadMethodCallException;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\Message;
+use DDDStarterPack\Message\Application\Message;
class AWSMessage implements Message
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactory.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactory.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactory.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactory.php
index 51d1c4e..943aab6 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactory.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS;
+namespace DDDStarterPack\Message\Infrastructure\AWS;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\MessageFactory;
+use DDDStarterPack\Message\Application\MessageFactory;
/**
* @implements MessageFactory
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageProducerResponse.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageProducerResponse.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageProducerResponse.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageProducerResponse.php
index 93c9d4b..c47392e 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageProducerResponse.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageProducerResponse.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS;
+namespace DDDStarterPack\Message\Infrastructure\AWS;
use Aws\Result;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
use Webmozart\Assert\Assert;
class AWSMessageProducerResponse implements MessageProducerResponse
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfiguration.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfiguration.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfiguration.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfiguration.php
index 85cae34..e026bad 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfiguration.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfiguration.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
abstract class AWSConfiguration
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationBuilder.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationBuilder.php
similarity index 85%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationBuilder.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationBuilder.php
index 006d577..a615c69 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationBuilder.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationBuilder.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationBuilder;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationBuilder;
abstract class AWSConfigurationBuilder extends ConfigurationBuilder
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationValidator.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationValidator.php
similarity index 78%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationValidator.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationValidator.php
index b7f8c6a..baa7fc4 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AWSConfigurationValidator.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AWSConfigurationValidator.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationValidator;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationValidator;
abstract class AWSConfigurationValidator extends ConfigurationValidator
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php
similarity index 65%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php
index c824ab8..86066c6 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraint.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamConstraint;
class AccessKeyIsValidConfigurationParamConstraint extends ConfigurationParamConstraint
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php
similarity index 64%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php
index e315e59..119e189 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraint.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamConstraint;
class RegionIsValidConfigurationParamConstraint extends ConfigurationParamConstraint
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php
similarity index 65%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php
index 63a6087..58c2a70 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraint.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamConstraint;
class SecretKeyIsValidConfigurationParamConstraint extends ConfigurationParamConstraint
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/AWSCredentials.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/AWSCredentials.php
similarity index 82%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/AWSCredentials.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/AWSCredentials.php
index 13886d0..05b9304 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/AWSCredentials.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/AWSCredentials.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient;
+namespace DDDStarterPack\Message\Infrastructure\AWS\RawClient;
use Aws\Credentials\Credentials;
-use DDDStarterPack\Application\Util\EnvVarUtil;
+use DDDStarterPack\Util\EnvVarUtil;
trait AWSCredentials
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SnsRawClient.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SnsRawClient.php
similarity index 89%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SnsRawClient.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SnsRawClient.php
index 6423466..53bce96 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SnsRawClient.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SnsRawClient.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient;
+namespace DDDStarterPack\Message\Infrastructure\AWS\RawClient;
use Aws\Sns\SnsClient;
-use DDDStarterPack\Application\Util\EnvVarUtil;
+use DDDStarterPack\Util\EnvVarUtil;
use Webmozart\Assert\Assert;
trait SnsRawClient
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SqsRawClient.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SqsRawClient.php
similarity index 95%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SqsRawClient.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SqsRawClient.php
index 225f6c5..0cacc1c 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/RawClient/SqsRawClient.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/RawClient/SqsRawClient.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient;
+namespace DDDStarterPack\Message\Infrastructure\AWS\RawClient;
use Aws\Result;
use Aws\Sqs\SqsClient;
-use DDDStarterPack\Application\Util\EnvVarUtil;
+use DDDStarterPack\Util\EnvVarUtil;
use Webmozart\Assert\Assert;
trait SqsRawClient
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfiguration.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfiguration.php
similarity index 73%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfiguration.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfiguration.php
index 8cb2f55..fa7a19d 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfiguration.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfiguration.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfiguration;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfiguration;
class SNSConfiguration extends AWSConfiguration
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilder.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilder.php
similarity index 67%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilder.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilder.php
index cc36560..bf029c0 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilder.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilder.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfigurationBuilder;
class SNSConfigurationBuilder extends AWSConfigurationBuilder
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidator.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidator.php
similarity index 62%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidator.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidator.php
index 29a76e1..5eb4825 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidator.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidator.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfigurationValidator;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfigurationValidator;
class SNSConfigurationValidator extends AWSConfigurationValidator
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php
similarity index 65%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php
index a9190f6..78f2cf2 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraint.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamConstraint;
class TopicArnIsValidConfigurationParamConstraint extends ConfigurationParamConstraint
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisher.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisher.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisher.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisher.php
index 115ad3d..09dd371 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisher.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisher.php
@@ -2,22 +2,22 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SNS;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SNS;
use Aws\Sns\SnsClient;
use BadMethodCallException;
use DateTimeInterface;
-use DDDStarterPack\Application\Message\BasicMessageService;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationValidator;
-use DDDStarterPack\Application\Message\Exception\MessageInvalidException;
-use DDDStarterPack\Application\Message\MessageProducerConnector;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSBasicService;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessageProducerResponse;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfiguration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationValidator;
+use DDDStarterPack\Message\Application\BasicMessageService;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationValidator;
+use DDDStarterPack\Message\Application\Exception\MessageInvalidException;
+use DDDStarterPack\Message\Application\MessageProducerConnector;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSBasicService;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessageProducerResponse;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfiguration;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationValidator;
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Webmozart\Assert\Assert;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php
similarity index 64%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php
index 8998bac..80c8e96 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraint.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamConstraint;
class QueueNameIsValidConfigurationParamConstraint extends ConfigurationParamConstraint
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfiguration.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfiguration.php
similarity index 73%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfiguration.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfiguration.php
index 275fc21..df9226c 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfiguration.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfiguration.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfiguration;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfiguration;
class SQSConfiguration extends AWSConfiguration
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilder.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilder.php
similarity index 67%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilder.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilder.php
index dafc6e3..ce7d3c9 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilder.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilder.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfigurationBuilder;
class SQSConfigurationBuilder extends AWSConfigurationBuilder
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidator.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidator.php
similarity index 62%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidator.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidator.php
index 2e298c8..e1da934 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidator.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidator.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AWSConfigurationValidator;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AWSConfigurationValidator;
class SQSConfigurationValidator extends AWSConfigurationValidator
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSBasicService.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSBasicService.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSBasicService.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSBasicService.php
index 778055a..9c77d68 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSBasicService.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSBasicService.php
@@ -2,13 +2,13 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS;
use Aws\Sqs\SqsClient;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationValidator;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfiguration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationValidator;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationValidator;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfiguration;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationValidator;
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Webmozart\Assert\Assert;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumer.php
similarity index 91%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumer.php
index 3b0f0c7..33228a0 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumer.php
@@ -2,18 +2,18 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS;
use ArrayObject;
use Aws\Result;
use BadMethodCallException;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\BasicMessageService;
-use DDDStarterPack\Application\Message\Message;
-use DDDStarterPack\Application\Message\MessageConsumerConnector;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSBasicService;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessageFactory;
+use DDDStarterPack\Message\Application\BasicMessageService;
+use DDDStarterPack\Message\Application\Message;
+use DDDStarterPack\Message\Application\MessageConsumerConnector;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSBasicService;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessageFactory;
use Exception;
use Webmozart\Assert\Assert;
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducer.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducer.php
index 9c1755f..cafc734 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducer.php
@@ -2,19 +2,19 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\AWS\SQS;
+namespace DDDStarterPack\Message\Infrastructure\AWS\SQS;
use Aws\Result;
use BadMethodCallException;
use DateTimeInterface;
-use DDDStarterPack\Application\Message\BasicMessageService;
-use DDDStarterPack\Application\Message\Exception\MessageInvalidException;
-use DDDStarterPack\Application\Message\Message;
-use DDDStarterPack\Application\Message\MessageProducerConnector;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSBasicService;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessageProducerResponse;
+use DDDStarterPack\Message\Application\BasicMessageService;
+use DDDStarterPack\Message\Application\Exception\MessageInvalidException;
+use DDDStarterPack\Message\Application\Message;
+use DDDStarterPack\Message\Application\MessageProducerConnector;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSBasicService;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessageProducerResponse;
/**
* @psalm-suppress PropertyNotSetInConstructor
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessage.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessage.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessage.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessage.php
index 2a506ed..bd66bd4 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessage.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessage.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\Message;
+use DDDStarterPack\Message\Application\Message;
class InMemoryMessage implements Message
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageConsumer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageConsumer.php
similarity index 69%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageConsumer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageConsumer.php
index 7d9c698..b700796 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageConsumer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageConsumer.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
use ArrayObject;
-use DDDStarterPack\Application\Message\Message;
-use DDDStarterPack\Application\Message\MessageConsumer;
+use DDDStarterPack\Message\Application\Message;
+use DDDStarterPack\Message\Application\MessageConsumer;
class InMemoryMessageConsumer implements MessageConsumer
{
@@ -18,7 +18,7 @@ public function __construct(InMemoryMessageQueue $messageQueue)
$this->messageQueue = $messageQueue;
}
- public function consume(): ?Message
+ public function consume(null|string $queue = null): null|Message
{
return $this->messageQueue->popMessage();
}
@@ -31,7 +31,7 @@ public function consumeBatch(): array
/**
* @param mixed $messageId
*/
- public function delete($messageId): void
+ public function delete(string $messageId, null|string $queue = null): void
{
}
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageFactory.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageFactory.php
similarity index 82%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageFactory.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageFactory.php
index 8183654..39615a9 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageFactory.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\MessageFactory;
+use DDDStarterPack\Message\Application\MessageFactory;
use Webmozart\Assert\Assert;
/**
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducer.php
similarity index 89%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducer.php
index 45b71bf..872bfab 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducer.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
-use DDDStarterPack\Application\Message\MessageProducer;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
+use DDDStarterPack\Message\Application\MessageProducer;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
use InvalidArgumentException;
/**
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducerResponse.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducerResponse.php
similarity index 82%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducerResponse.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducerResponse.php
index 85b2cfc..8576add 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageProducerResponse.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageProducerResponse.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
use Ramsey\Uuid\Uuid;
class InMemoryMessageProducerResponse implements MessageProducerResponse
@@ -42,12 +42,12 @@ public function sentMessages(): int
return $this->sentMessages;
}
- public function originalResponse()
+ public function originalResponse(): mixed
{
return $this->originalResponse;
}
- public function body()
+ public function body(): mixed
{
if ($this->success) {
return ['success' => true];
@@ -56,7 +56,7 @@ public function body()
return ['success' => false];
}
- public function sentMessageId()
+ public function sentMessageId(): mixed
{
return $this->messageId ?: Uuid::uuid4();
}
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageQueue.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageQueue.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageQueue.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageQueue.php
index bcf7e2f..8a98d09 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/InMemory/InMemoryMessageQueue.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/InMemory/InMemoryMessageQueue.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\InMemory;
+namespace DDDStarterPack\Message\Infrastructure\InMemory;
-use DDDStarterPack\Application\Message\Message;
+use DDDStarterPack\Message\Application\Message;
use InvalidArgumentException;
class InMemoryMessageQueue
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQConnection.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQConnection.php
similarity index 90%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQConnection.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQConnection.php
index f8e604e..7747ac3 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQConnection.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQConnection.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
class RabbitMQConnection
{
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessage.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessage.php
similarity index 86%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessage.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessage.php
index a4305f0..94816cb 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessage.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessage.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\Message;
+use DDDStarterPack\Message\Application\Message;
class RabbitMQMessage implements Message
{
@@ -44,7 +44,7 @@ public function type(): ?string
return $this->type;
}
- public function id()
+ public function id(): mixed
{
return $this->id;
}
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageConsumer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageConsumer.php
similarity index 88%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageConsumer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageConsumer.php
index 73ad2cd..8344b7a 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageConsumer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageConsumer.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
use ArrayObject;
-use DDDStarterPack\Application\Message\Message;
-use DDDStarterPack\Application\Message\MessageConsumer;
+use DDDStarterPack\Message\Application\Message;
+use DDDStarterPack\Message\Application\MessageConsumer;
use PhpAmqpLib\Exception\AMQPTimeoutException;
use PhpAmqpLib\Message\AMQPMessage;
@@ -21,7 +21,7 @@ public function __construct(RabbitMQConnection $connectionData, string $queueNam
$this->messageFactory = $messageFactory;
}
- public function consume(): ?Message
+ public function consume(null|string $queue = null): null|Message
{
$this->open();
@@ -67,7 +67,7 @@ public function consume(): ?Message
return null;
}
- public function delete($messageId): void
+ public function delete(string $messageId, null|string $queue = null): void
{
$this->channel->basic_ack($messageId);
}
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageFactory.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageFactory.php
similarity index 78%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageFactory.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageFactory.php
index e7bcf19..a9824f7 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageFactory.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageFactory.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
use DateTimeImmutable;
-use DDDStarterPack\Application\Message\MessageFactory;
+use DDDStarterPack\Message\Application\MessageFactory;
/**
* Class RabbitMQMessageFactory.
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducer.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducer.php
similarity index 73%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducer.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducer.php
index c64b993..ad42d32 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducer.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducer.php
@@ -2,16 +2,16 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
-use DDDStarterPack\Application\Message\Message;
-use DDDStarterPack\Application\Message\MessageProducer;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
+use DDDStarterPack\Message\Application\Message;
+use DDDStarterPack\Message\Application\MessageProducer;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
use PhpAmqpLib\Message\AMQPMessage;
class RabbitMQMessageProducer extends RabbitMQMessanger implements MessageProducer
{
- public function send(Message $message): MessageProducerResponse
+ public function send($message): MessageProducerResponse
{
$body = $message->body();
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducerResponse.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducerResponse.php
similarity index 77%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducerResponse.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducerResponse.php
index 0e8ead1..1e92d4f 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessageProducerResponse.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessageProducerResponse.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
-use DDDStarterPack\Application\Message\MessageProducerResponse;
+use DDDStarterPack\Message\Application\MessageProducerResponse;
use PhpAmqpLib\Message\AMQPMessage;
class RabbitMQMessageProducerResponse implements MessageProducerResponse
@@ -23,12 +23,12 @@ public function sentMessages(): int
return $this->sentMessages;
}
- public function originalResponse()
+ public function originalResponse(): mixed
{
return $this->originalProducedMessage;
}
- public function body()
+ public function body(): mixed
{
if ($this->originalProducedMessage) {
return $this->originalProducedMessage->body;
@@ -37,7 +37,7 @@ public function body()
return null;
}
- public function sentMessageId()
+ public function sentMessageId(): mixed
{
return null;
}
diff --git a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessanger.php b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessanger.php
similarity index 95%
rename from src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessanger.php
rename to src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessanger.php
index e7a73dd..2b393a5 100644
--- a/src/Matiux/DDDStarterPack/Infrastructure/Application/Message/RabbitMQ/RabbitMQMessanger.php
+++ b/src/Matiux/DDDStarterPack/Message/Infrastructure/RabbitMQ/RabbitMQMessanger.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Infrastructure\Application\Message\RabbitMQ;
+namespace DDDStarterPack\Message\Infrastructure\RabbitMQ;
use PhpAmqpLib\Channel\AMQPChannel;
use PhpAmqpLib\Connection\AMQPStreamConnection;
diff --git a/src/Matiux/DDDStarterPack/Application/Service/ApplicationService.php b/src/Matiux/DDDStarterPack/Service/Application/ApplicationService.php
similarity index 62%
rename from src/Matiux/DDDStarterPack/Application/Service/ApplicationService.php
rename to src/Matiux/DDDStarterPack/Service/Application/ApplicationService.php
index 3163dcd..43b8a31 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/ApplicationService.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/ApplicationService.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service;
+namespace DDDStarterPack\Service\Application;
-use DDDStarterPack\Domain\Service\Service;
+use DDDStarterPack\Service\Domain\Service;
/**
* @template I
diff --git a/src/Matiux/DDDStarterPack/Application/Service/Filter/PaginationFilterRequest.php b/src/Matiux/DDDStarterPack/Service/Application/Filter/PaginationFilterRequest.php
similarity index 92%
rename from src/Matiux/DDDStarterPack/Application/Service/Filter/PaginationFilterRequest.php
rename to src/Matiux/DDDStarterPack/Service/Application/Filter/PaginationFilterRequest.php
index 40017ca..c8c951e 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/Filter/PaginationFilterRequest.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/Filter/PaginationFilterRequest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service\Filter;
+namespace DDDStarterPack\Service\Application\Filter;
use DDDStarterPack\Domain\Aggregate\Repository\Filter\PaginationFilterParamsApplierKeys;
diff --git a/src/Matiux/DDDStarterPack/Application/Service/Filter/SortingFilterRequest.php b/src/Matiux/DDDStarterPack/Service/Application/Filter/SortingFilterRequest.php
similarity index 92%
rename from src/Matiux/DDDStarterPack/Application/Service/Filter/SortingFilterRequest.php
rename to src/Matiux/DDDStarterPack/Service/Application/Filter/SortingFilterRequest.php
index d8ef0e5..b3b4b40 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/Filter/SortingFilterRequest.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/Filter/SortingFilterRequest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service\Filter;
+namespace DDDStarterPack\Service\Application\Filter;
use DDDStarterPack\Domain\Aggregate\Repository\Filter\SortingFilterParamsApplierKeys;
diff --git a/src/Matiux/DDDStarterPack/Application/Service/NoRequestApplicationService.php b/src/Matiux/DDDStarterPack/Service/Application/NoRequestApplicationService.php
similarity index 62%
rename from src/Matiux/DDDStarterPack/Application/Service/NoRequestApplicationService.php
rename to src/Matiux/DDDStarterPack/Service/Application/NoRequestApplicationService.php
index 0c0280e..c41459a 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/NoRequestApplicationService.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/NoRequestApplicationService.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service;
+namespace DDDStarterPack\Service\Application;
-use DDDStarterPack\Domain\Service\NoRequestService;
+use DDDStarterPack\Service\Domain\NoRequestService;
/**
* @template O
diff --git a/src/Matiux/DDDStarterPack/Application/Service/Response/BasicApplicationServiceResponse.php b/src/Matiux/DDDStarterPack/Service/Application/Response/BasicApplicationServiceResponse.php
similarity index 53%
rename from src/Matiux/DDDStarterPack/Application/Service/Response/BasicApplicationServiceResponse.php
rename to src/Matiux/DDDStarterPack/Service/Application/Response/BasicApplicationServiceResponse.php
index 932bf24..793c0a1 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/Response/BasicApplicationServiceResponse.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/Response/BasicApplicationServiceResponse.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service\Response;
+namespace DDDStarterPack\Service\Application\Response;
-use DDDStarterPack\Domain\Service\Response\BasicServiceResponse;
-use DDDStarterPack\Domain\Service\Response\ServiceResponse;
+use DDDStarterPack\Service\Domain\Response\BasicServiceResponse;
+use DDDStarterPack\Service\Domain\Response\ServiceResponse;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Application/Service/TransactionalApplicationService.php b/src/Matiux/DDDStarterPack/Service/Application/TransactionalApplicationService.php
similarity index 85%
rename from src/Matiux/DDDStarterPack/Application/Service/TransactionalApplicationService.php
rename to src/Matiux/DDDStarterPack/Service/Application/TransactionalApplicationService.php
index 64c649a..375a3a5 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/TransactionalApplicationService.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/TransactionalApplicationService.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service;
+namespace DDDStarterPack\Service\Application;
-use DDDStarterPack\Application\Exception\TransactionFailedException;
-use DDDStarterPack\Domain\Service\Service;
+use DDDStarterPack\Exception\Application\TransactionFailedException;
+use DDDStarterPack\Service\Domain\Service;
use Throwable;
/**
diff --git a/src/Matiux/DDDStarterPack/Application/Service/TransactionalSession.php b/src/Matiux/DDDStarterPack/Service/Application/TransactionalSession.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Application/Service/TransactionalSession.php
rename to src/Matiux/DDDStarterPack/Service/Application/TransactionalSession.php
index 29c9bf7..6bd33db 100644
--- a/src/Matiux/DDDStarterPack/Application/Service/TransactionalSession.php
+++ b/src/Matiux/DDDStarterPack/Service/Application/TransactionalSession.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Service;
+namespace DDDStarterPack\Service\Application;
/**
* @template O
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/CommandService.php b/src/Matiux/DDDStarterPack/Service/Domain/CommandService.php
similarity index 53%
rename from src/Matiux/DDDStarterPack/Domain/Service/CommandService.php
rename to src/Matiux/DDDStarterPack/Service/Domain/CommandService.php
index 108d837..ef1ff72 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/CommandService.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/CommandService.php
@@ -2,10 +2,12 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service;
+namespace DDDStarterPack\Service\Domain;
+
+use DDDStarterPack\Command\DomainCommand;
/**
- * @template I of \DDDStarterPack\Domain\Command\DomainCommand
+ * @template I of DomainCommand
*
* @extends Service
*/
@@ -13,7 +15,7 @@ interface CommandService extends Service
{
/**
* @param I $command
- * @psalm-assert \DDDStarterPack\Domain\Command\DomainCommand $command
+ * @psalm-assert DomainCommand $command
*/
public function execute($command): void;
}
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/NoRequestService.php b/src/Matiux/DDDStarterPack/Service/Domain/NoRequestService.php
similarity index 85%
rename from src/Matiux/DDDStarterPack/Domain/Service/NoRequestService.php
rename to src/Matiux/DDDStarterPack/Service/Domain/NoRequestService.php
index a934565..46bf742 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/NoRequestService.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/NoRequestService.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service;
+namespace DDDStarterPack\Service\Domain;
/**
* @template O
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/Response/BasicServiceResponse.php b/src/Matiux/DDDStarterPack/Service/Domain/Response/BasicServiceResponse.php
similarity index 97%
rename from src/Matiux/DDDStarterPack/Domain/Service/Response/BasicServiceResponse.php
rename to src/Matiux/DDDStarterPack/Service/Domain/Response/BasicServiceResponse.php
index 7d0670c..dcc31b3 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/Response/BasicServiceResponse.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/Response/BasicServiceResponse.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service\Response;
+namespace DDDStarterPack\Service\Domain\Response;
/**
* @template B of mixed
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/Response/ServiceResponse.php b/src/Matiux/DDDStarterPack/Service/Domain/Response/ServiceResponse.php
similarity index 82%
rename from src/Matiux/DDDStarterPack/Domain/Service/Response/ServiceResponse.php
rename to src/Matiux/DDDStarterPack/Service/Domain/Response/ServiceResponse.php
index 9382db8..7573095 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/Response/ServiceResponse.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/Response/ServiceResponse.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service\Response;
+namespace DDDStarterPack\Service\Domain\Response;
/**
* @template B of mixed
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/Serializer.php b/src/Matiux/DDDStarterPack/Service/Domain/Serializer.php
similarity index 93%
rename from src/Matiux/DDDStarterPack/Domain/Service/Serializer.php
rename to src/Matiux/DDDStarterPack/Service/Domain/Serializer.php
index 99f3d1c..0648075 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/Serializer.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/Serializer.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service;
+namespace DDDStarterPack\Service\Domain;
/**
* @template T
diff --git a/src/Matiux/DDDStarterPack/Domain/Service/Service.php b/src/Matiux/DDDStarterPack/Service/Domain/Service.php
similarity index 82%
rename from src/Matiux/DDDStarterPack/Domain/Service/Service.php
rename to src/Matiux/DDDStarterPack/Service/Domain/Service.php
index 4f2dd13..8feaad9 100644
--- a/src/Matiux/DDDStarterPack/Domain/Service/Service.php
+++ b/src/Matiux/DDDStarterPack/Service/Domain/Service.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Domain\Service;
+namespace DDDStarterPack\Service\Domain;
/**
* @template I
diff --git a/src/Matiux/DDDStarterPack/Application/Util/EnvVarUtil.php b/src/Matiux/DDDStarterPack/Util/EnvVarUtil.php
similarity index 83%
rename from src/Matiux/DDDStarterPack/Application/Util/EnvVarUtil.php
rename to src/Matiux/DDDStarterPack/Util/EnvVarUtil.php
index 14b1eeb..48a51da 100644
--- a/src/Matiux/DDDStarterPack/Application/Util/EnvVarUtil.php
+++ b/src/Matiux/DDDStarterPack/Util/EnvVarUtil.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace DDDStarterPack\Application\Util;
+namespace DDDStarterPack\Util;
class EnvVarUtil
{
diff --git a/tests/DDDStarterPack/Domain/Aggregate/DomainCollectionTest.php b/tests/DDDStarterPack/Domain/Aggregate/DomainCollectionTest.php
deleted file mode 100644
index 3e30d0f..0000000
--- a/tests/DDDStarterPack/Domain/Aggregate/DomainCollectionTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-add(Person::crea(PersonId::create(), 'Teo', 85));
-
- // Psalm gets angry - as it should be
- // $collection->add(new \stdClass());
-
- self::assertCount(2, $people);
- }
-
- /**
- * @test
- */
- public function create_empty(): void
- {
- /** @psalm-var DomainCollection $people */
- $people = new DomainCollection();
-
- // Psalm gets angry - as it should be
- //$collection->add(new \stdClass());
-
- $people->add(Person::crea(PersonId::create(), 'Mat', 34));
-
- self::assertCount(1, $people);
- }
-
- /**
- * @test
- */
- public function loop_over(): void
- {
- /**
- * @psalm-var DomainCollection $people
- */
- $people = new DomainCollection();
-
- $people->add(Person::crea(PersonId::create(), 'Mat', 34));
- $people->add(Person::crea(PersonId::create(), 'Teo', 85));
-
- $i = 0;
-
- foreach ($people as $_person) {
- ++$i;
- }
-
- self::assertEquals(2, $i);
- }
-
- /**
- * @test
- */
- public function should_merge_two_collections(): void
- {
- /**
- * @psalm-var DomainCollection $people1
- */
- $people1 = new DomainCollection();
- $people1->add(Person::crea(PersonId::create(), 'Mat', 34));
-
- /**
- * @psalm-var DomainCollection $people2
- */
- $people2 = new DomainCollection();
- $people2->add(Person::crea(PersonId::create(), 'Teo', 85));
-
- $people = $people1->merge($people2);
-
- self::assertCount(2, $people);
-
- $mat = $people->current();
- $people->next();
-
- $teo = $people->current();
-
- self::assertSame('Mat', $mat->name());
- self::assertSame('Teo', $teo->name());
- }
-
- /**
- * @test
- */
- public function use_specific_collection(): void
- {
- $collection = new SpecificCollection();
- //$collection->add('Foo'); // Psalm si arrabbia, giustamente
- $collection->add(new stdClass());
-
- self::assertCount(1, $collection);
- }
-}
-
-/**
- * @extends DomainCollection
- */
-class SpecificCollection extends DomainCollection
-{
-}
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisherTest.php b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisherTest.php
similarity index 84%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisherTest.php
rename to tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisherTest.php
index ab1ea60..041d3a9 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/SNSMessagePubblisherTest.php
+++ b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SNS/SNSMessagePubblisherTest.php
@@ -2,19 +2,19 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SNS;
+namespace Tests\Integration\DDDStarterPack\Message\Infrastructure\AWS\SNS;
use DateTimeImmutable;
use DateTimeInterface;
-use DDDStarterPack\Application\Message\Factory\MessageConsumerFactory;
-use DDDStarterPack\Application\Message\Factory\MessageProducerFactory;
-use DDDStarterPack\Application\Message\MessageConsumer;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SnsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SqsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Factory\MessageConsumerFactory;
+use DDDStarterPack\Message\Application\Factory\MessageProducerFactory;
+use DDDStarterPack\Message\Application\MessageConsumer;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SnsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SqsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
use Ramsey\Uuid\Uuid;
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumerTest.php b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumerTest.php
similarity index 81%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumerTest.php
rename to tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumerTest.php
index 04c3ad6..4204d2b 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageConsumerTest.php
+++ b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageConsumerTest.php
@@ -2,19 +2,19 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SQS;
+namespace Tests\Integration\DDDStarterPack\Message\Infrastructure\AWS\SQS;
use DateTimeImmutable;
use DateTimeInterface;
-use DDDStarterPack\Application\Message\Factory\MessageConsumerFactory;
-use DDDStarterPack\Application\Message\Factory\MessageProducerFactory;
-use DDDStarterPack\Application\Message\MessageConsumer;
-use DDDStarterPack\Application\Message\MessageProducer;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SnsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SqsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Factory\MessageConsumerFactory;
+use DDDStarterPack\Message\Application\Factory\MessageProducerFactory;
+use DDDStarterPack\Message\Application\MessageConsumer;
+use DDDStarterPack\Message\Application\MessageProducer;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SnsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SqsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
use Ramsey\Uuid\Uuid;
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducerTest.php b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducerTest.php
similarity index 85%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducerTest.php
rename to tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducerTest.php
index 151a06e..9d234b7 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/SQSMessageProducerTest.php
+++ b/tests/Integration/DDDStarterPack/Message/Infrastructure/AWS/SQS/SQSMessageProducerTest.php
@@ -2,18 +2,18 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SQS;
+namespace Tests\Integration\DDDStarterPack\Message\Infrastructure\AWS\SQS;
use DateTimeImmutable;
use DateTimeInterface;
-use DDDStarterPack\Application\Message\Factory\MessageConsumerFactory;
-use DDDStarterPack\Application\Message\Factory\MessageProducerFactory;
-use DDDStarterPack\Application\Message\MessageConsumer;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessage;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SnsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SqsRawClient;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Factory\MessageConsumerFactory;
+use DDDStarterPack\Message\Application\Factory\MessageProducerFactory;
+use DDDStarterPack\Message\Application\MessageConsumer;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessage;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SnsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SqsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
use Ramsey\Uuid\Uuid;
diff --git a/tests/Learning/SQS/SqsLearningTest.php b/tests/Learning/SQS/SqsLearningTest.php
index b0bc1d1..fc0684d 100644
--- a/tests/Learning/SQS/SqsLearningTest.php
+++ b/tests/Learning/SQS/SqsLearningTest.php
@@ -6,8 +6,8 @@
use DateTimeImmutable;
use DateTimeInterface;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\RawClient\SqsRawClient;
+use DDDStarterPack\Message\Infrastructure\AWS\RawClient\SqsRawClient;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
use Ramsey\Uuid\Uuid;
diff --git a/tests/Support/Model/Doctrine/DoctrinePersonId.php b/tests/Support/Model/Doctrine/DoctrinePersonId.php
index 1b58458..1681d2c 100644
--- a/tests/Support/Model/Doctrine/DoctrinePersonId.php
+++ b/tests/Support/Model/Doctrine/DoctrinePersonId.php
@@ -4,7 +4,7 @@
namespace Tests\Support\Model\Doctrine;
-use DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\DoctrineEntityId;
+use DDDStarterPack\Aggregate\Infrastructure\Doctrine\DoctrineEntityId;
use Tests\Support\Model\PersonId;
class DoctrinePersonId extends DoctrineEntityId
diff --git a/tests/Support/Model/Person.php b/tests/Support/Model/Person.php
index 316a866..cde5180 100644
--- a/tests/Support/Model/Person.php
+++ b/tests/Support/Model/Person.php
@@ -4,7 +4,7 @@
namespace Tests\Support\Model;
-use DDDStarterPack\Domain\Aggregate\IdentifiableDomainObject;
+use DDDStarterPack\Aggregate\Domain\IdentifiableDomainObject;
class Person implements IdentifiableDomainObject
{
diff --git a/tests/Support/Model/PersonId.php b/tests/Support/Model/PersonId.php
index 88d3694..8e913d5 100644
--- a/tests/Support/Model/PersonId.php
+++ b/tests/Support/Model/PersonId.php
@@ -4,7 +4,7 @@
namespace Tests\Support\Model;
-use DDDStarterPack\Domain\Aggregate\BasicEntityId;
+use DDDStarterPack\Aggregate\Domain\BasicEntityId;
class PersonId extends BasicEntityId
{
diff --git a/tests/DDDStarterPack/Domain/Aggregate/BasicEntityIdTest.php b/tests/Unit/DDDStarterPack/Aggregate/Domain/BasicEntityIdTest.php
similarity index 93%
rename from tests/DDDStarterPack/Domain/Aggregate/BasicEntityIdTest.php
rename to tests/Unit/DDDStarterPack/Aggregate/Domain/BasicEntityIdTest.php
index 01d3b40..93dfcc0 100644
--- a/tests/DDDStarterPack/Domain/Aggregate/BasicEntityIdTest.php
+++ b/tests/Unit/DDDStarterPack/Aggregate/Domain/BasicEntityIdTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Aggregate;
+namespace Tests\Unit\DDDStarterPack\Aggregate\Domain;
-use DDDStarterPack\Domain\Aggregate\BasicEntityId;
+use DDDStarterPack\Aggregate\Domain\BasicEntityId;
use PHPUnit\Framework\TestCase;
class BasicEntityIdTest extends TestCase
diff --git a/tests/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilderTest.php b/tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilderTest.php
similarity index 91%
rename from tests/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilderTest.php
rename to tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilderTest.php
index 1e4913f..1bf6c05 100644
--- a/tests/DDDStarterPack/Domain/Aggregate/Repository/Filter/FilterParamsBuilderTest.php
+++ b/tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/Filter/FilterParamsBuilderTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Aggregate\Repository\Filter;
+namespace Tests\Unit\DDDStarterPack\Aggregate\Domain\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsApplier;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsBuilder;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsBuilder;
use InvalidArgumentException;
use LogicException;
use PHPUnit\Framework\TestCase;
diff --git a/tests/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepositoryTest.php b/tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepositoryTest.php
similarity index 90%
rename from tests/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepositoryTest.php
rename to tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepositoryTest.php
index 0dcb430..6b4aa33 100644
--- a/tests/DDDStarterPack/Domain/Aggregate/Repository/IdentifiableRepositoryTest.php
+++ b/tests/Unit/DDDStarterPack/Aggregate/Domain/Repository/IdentifiableRepositoryTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Aggregate\Repository;
+namespace Tests\Unit\DDDStarterPack\Aggregate\Domain\Repository;
-use DDDStarterPack\Domain\Aggregate\Repository\IdentifiableRepository;
+use DDDStarterPack\Aggregate\Domain\Repository\IdentifiableRepository;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
use Tests\Support\Model\PersonId;
diff --git a/tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php b/tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php
similarity index 82%
rename from tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php
rename to tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php
index 8bd7190..69ec69b 100644
--- a/tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php
+++ b/tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericPaginationApplierTest.php
@@ -2,12 +2,12 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
+namespace Tests\Unit\DDDStarterPack\Aggregate\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsApplier;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsBuilder;
-use DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter\DoctrineGenericPaginationApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsBuilder;
+use DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository\Filter\DoctrineGenericPaginationApplier;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
use Tests\Tool\DoctrineUtil;
diff --git a/tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php b/tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php
similarity index 81%
rename from tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php
rename to tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php
index a166fee..b06ba1e 100644
--- a/tests/DDDStarterPack/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php
+++ b/tests/Unit/DDDStarterPack/Aggregate/Infrastructure/Domain/Aggregate/Doctrine/Repository/Filter/DoctrineGenericSortApplierTest.php
@@ -2,12 +2,12 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
+namespace Tests\Unit\DDDStarterPack\Aggregate\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParams;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsApplier;
-use DDDStarterPack\Domain\Aggregate\Repository\Filter\FilterParamsBuilder;
-use DDDStarterPack\Infrastructure\Domain\Aggregate\Doctrine\Repository\Filter\DoctrineGenericSortApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParams;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsApplier;
+use DDDStarterPack\Aggregate\Domain\Repository\Filter\FilterParamsBuilder;
+use DDDStarterPack\Aggregate\Infrastructure\Doctrine\Repository\Filter\DoctrineGenericSortApplier;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
use Tests\Tool\DoctrineUtil;
diff --git a/tests/DDDStarterPack/Application/DataTransformer/BasicCollectionDataTransformerTest.php b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicCollectionDataTransformerTest.php
similarity index 91%
rename from tests/DDDStarterPack/Application/DataTransformer/BasicCollectionDataTransformerTest.php
rename to tests/Unit/DDDStarterPack/DataTransformer/Application/BasicCollectionDataTransformerTest.php
index e8ac7a2..b040840 100644
--- a/tests/DDDStarterPack/Application/DataTransformer/BasicCollectionDataTransformerTest.php
+++ b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicCollectionDataTransformerTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\DataTransformer;
+namespace Tests\Unit\DDDStarterPack\DataTransformer\Application;
-use DDDStarterPack\Application\DataTransformer\BasicCollectionDataTransformer;
+use DDDStarterPack\DataTransformer\Application\BasicCollectionDataTransformer;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
use Tests\Support\Model\PersonId;
diff --git a/tests/DDDStarterPack/Application/DataTransformer/BasicItemDataTransformerTest.php b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicItemDataTransformerTest.php
similarity index 90%
rename from tests/DDDStarterPack/Application/DataTransformer/BasicItemDataTransformerTest.php
rename to tests/Unit/DDDStarterPack/DataTransformer/Application/BasicItemDataTransformerTest.php
index 3c1344a..bc7c2e6 100644
--- a/tests/DDDStarterPack/Application/DataTransformer/BasicItemDataTransformerTest.php
+++ b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicItemDataTransformerTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\DataTransformer;
+namespace Tests\Unit\DDDStarterPack\DataTransformer\Application;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
diff --git a/tests/DDDStarterPack/Application/DataTransformer/BasicPaginatorDataTransformerTest.php b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicPaginatorDataTransformerTest.php
similarity index 91%
rename from tests/DDDStarterPack/Application/DataTransformer/BasicPaginatorDataTransformerTest.php
rename to tests/Unit/DDDStarterPack/DataTransformer/Application/BasicPaginatorDataTransformerTest.php
index 4192fc4..aff252d 100644
--- a/tests/DDDStarterPack/Application/DataTransformer/BasicPaginatorDataTransformerTest.php
+++ b/tests/Unit/DDDStarterPack/DataTransformer/Application/BasicPaginatorDataTransformerTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\DataTransformer;
+namespace Tests\Unit\DDDStarterPack\DataTransformer\Application;
use ArrayObject;
-use DDDStarterPack\Application\DataTransformer\BasicPaginatorDataTransformer;
-use DDDStarterPack\Domain\Aggregate\Repository\Paginator\AbstractPaginator;
+use DDDStarterPack\Aggregate\Domain\Repository\Paginator\AbstractPaginator;
+use DDDStarterPack\DataTransformer\Application\BasicPaginatorDataTransformer;
use PHPUnit\Framework\TestCase;
use Tests\Support\Model\Person;
use Tests\Support\Model\PersonId;
diff --git a/tests/DDDStarterPack/Application/DataTransformer/PersonDataTransformer.php b/tests/Unit/DDDStarterPack/DataTransformer/Application/PersonDataTransformer.php
similarity index 72%
rename from tests/DDDStarterPack/Application/DataTransformer/PersonDataTransformer.php
rename to tests/Unit/DDDStarterPack/DataTransformer/Application/PersonDataTransformer.php
index cfe713e..573f8fb 100644
--- a/tests/DDDStarterPack/Application/DataTransformer/PersonDataTransformer.php
+++ b/tests/Unit/DDDStarterPack/DataTransformer/Application/PersonDataTransformer.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\DataTransformer;
+namespace Tests\Unit\DDDStarterPack\DataTransformer\Application;
-use DDDStarterPack\Application\DataTransformer\BasicItemDataTransformer;
+use DDDStarterPack\DataTransformer\Application\BasicItemDataTransformer;
use Tests\Support\Model\Person;
/**
diff --git a/tests/DDDStarterPack/Application/Message/Configuration/ConfigurationParamRegistryTest.php b/tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationParamRegistryTest.php
similarity index 70%
rename from tests/DDDStarterPack/Application/Message/Configuration/ConfigurationParamRegistryTest.php
rename to tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationParamRegistryTest.php
index c567651..b674784 100644
--- a/tests/DDDStarterPack/Application/Message/Configuration/ConfigurationParamRegistryTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationParamRegistryTest.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\Message\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Application\Configuration;
-use DDDStarterPack\Application\Message\Configuration\ConfigurationParamRegistry;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AccessKeyIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\ConfigurationParamRegistry;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AccessKeyIsValidConfigurationParamConstraint;
use PHPUnit\Framework\TestCase;
class ConfigurationParamRegistryTest extends TestCase
diff --git a/tests/DDDStarterPack/Application/Message/Configuration/ConfigurationTest.php b/tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationTest.php
similarity index 77%
rename from tests/DDDStarterPack/Application/Message/Configuration/ConfigurationTest.php
rename to tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationTest.php
index d28c267..2fe7d7d 100644
--- a/tests/DDDStarterPack/Application/Message/Configuration/ConfigurationTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Application/Configuration/ConfigurationTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\Message\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Application\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
use PHPUnit\Framework\TestCase;
class ConfigurationTest extends TestCase
diff --git a/tests/DDDStarterPack/Application/Message/Factory/MessageConsumerFactoryTest.php b/tests/Unit/DDDStarterPack/Message/Application/Factory/MessageConsumerFactoryTest.php
similarity index 64%
rename from tests/DDDStarterPack/Application/Message/Factory/MessageConsumerFactoryTest.php
rename to tests/Unit/DDDStarterPack/Message/Application/Factory/MessageConsumerFactoryTest.php
index b308e18..addcb8b 100644
--- a/tests/DDDStarterPack/Application/Message/Factory/MessageConsumerFactoryTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Application/Factory/MessageConsumerFactoryTest.php
@@ -2,12 +2,12 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\Message\Factory;
+namespace Tests\Unit\DDDStarterPack\Message\Application\Factory;
-use DDDStarterPack\Application\Message\Factory\MessageConsumerFactory;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\SQSMessageConsumer;
+use DDDStarterPack\Message\Application\Factory\MessageConsumerFactory;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\SQSMessageConsumer;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
class MessageConsumerFactoryTest extends TestCase
diff --git a/tests/DDDStarterPack/Application/Message/Factory/MessageProducerFactoryTest.php b/tests/Unit/DDDStarterPack/Message/Application/Factory/MessageProducerFactoryTest.php
similarity index 72%
rename from tests/DDDStarterPack/Application/Message/Factory/MessageProducerFactoryTest.php
rename to tests/Unit/DDDStarterPack/Message/Application/Factory/MessageProducerFactoryTest.php
index 1acd34c..6bb4b23 100644
--- a/tests/DDDStarterPack/Application/Message/Factory/MessageProducerFactoryTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Application/Factory/MessageProducerFactoryTest.php
@@ -2,12 +2,12 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\Message\Factory;
+namespace Tests\Unit\DDDStarterPack\Message\Application\Factory;
-use DDDStarterPack\Application\Message\Factory\MessageProducerFactory;
-use DDDStarterPack\Application\Util\EnvVarUtil;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\SQSMessageProducer;
+use DDDStarterPack\Message\Application\Factory\MessageProducerFactory;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\SQSMessageProducer;
+use DDDStarterPack\Util\EnvVarUtil;
use PHPUnit\Framework\TestCase;
class MessageProducerFactoryTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactoryTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactoryTest.php
similarity index 78%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactoryTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactoryTest.php
index 2fc3786..61dada3 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/AWSMessageFactoryTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/AWSMessageFactoryTest.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS;
use DateTimeImmutable;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\AWSMessageFactory;
+use DDDStarterPack\Message\Infrastructure\AWS\AWSMessageFactory;
use PHPUnit\Framework\TestCase;
class AWSMessageFactoryTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php
similarity index 76%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php
index 11a0cd2..78fd8e1 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/AccessKeyIsValidConfigurationParamConstraintTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\AccessKeyIsValidConfigurationParamConstraint;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\AccessKeyIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class AccessKeyIsValidConfigurationParamConstraintTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php
similarity index 75%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php
index dfd18a1..21ca115 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/RegionIsValidConfigurationParamConstraintTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\RegionIsValidConfigurationParamConstraint;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\RegionIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class RegionIsValidConfigurationParamConstraintTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php
similarity index 76%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php
index 9f938ae..4a69841 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/Configuration/SecretKeyIsValidConfigurationParamConstraintTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\Configuration\SecretKeyIsValidConfigurationParamConstraint;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Infrastructure\AWS\Configuration\SecretKeyIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class SecretKeyIsValidConfigurationParamConstraintTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php
similarity index 80%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php
index 2a0d291..fde8b5f 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationBuilderTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class SNSConfigurationBuilderTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php
similarity index 84%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php
index bbd02b5..c2fe922 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/SNSConfigurationValidatorTest.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationValidator;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationValidator;
use PHPUnit\Framework\TestCase;
class SNSConfigurationValidatorTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php
similarity index 75%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php
index c88f9a9..ddd62b1 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SNS/Configuration/TopicArnIsValidConfigurationParamConstraintTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\SNSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SNS\Configuration\TopicArnIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\SNSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SNS\Configuration\TopicArnIsValidConfigurationParamConstraint;
use PHPUnit\Framework\TestCase;
class TopicArnIsValidConfigurationParamConstraintTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php
similarity index 75%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php
index 5beb1eb..1a73ea4 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/QueueNameIsValidConfigurationParamConstraintTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Application\Message\Configuration\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\QueueNameIsValidConfigurationParamConstraint;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Application\Configuration\Configuration;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\QueueNameIsValidConfigurationParamConstraint;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class QueueNameIsValidConfigurationParamConstraintTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php
similarity index 80%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php
index f18c276..61f895e 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationBuilderTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
use PHPUnit\Framework\TestCase;
class SQSConfigurationBuilderTest extends TestCase
diff --git a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php
similarity index 84%
rename from tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php
rename to tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php
index f5040df..ca08954 100644
--- a/tests/DDDStarterPack/Infrastructure/Application/Message/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php
+++ b/tests/Unit/DDDStarterPack/Message/Infrastructure/AWS/SQS/Configuration/SQSConfigurationValidatorTest.php
@@ -2,10 +2,10 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration;
+namespace Tests\Unit\DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationBuilder;
-use DDDStarterPack\Infrastructure\Application\Message\AWS\SQS\Configuration\SQSConfigurationValidator;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationBuilder;
+use DDDStarterPack\Message\Infrastructure\AWS\SQS\Configuration\SQSConfigurationValidator;
use PHPUnit\Framework\TestCase;
class SQSConfigurationValidatorTest extends TestCase
diff --git a/tests/DDDStarterPack/Application/Service/ApplicationServiceTest.php b/tests/Unit/DDDStarterPack/Service/Application/ApplicationServiceTest.php
similarity index 88%
rename from tests/DDDStarterPack/Application/Service/ApplicationServiceTest.php
rename to tests/Unit/DDDStarterPack/Service/Application/ApplicationServiceTest.php
index 49e2c49..17a7201 100644
--- a/tests/DDDStarterPack/Application/Service/ApplicationServiceTest.php
+++ b/tests/Unit/DDDStarterPack/Service/Application/ApplicationServiceTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Application\Service;
+namespace Tests\Unit\DDDStarterPack\Service\Application;
-use DDDStarterPack\Application\Service\ApplicationService;
+use DDDStarterPack\Service\Application\ApplicationService;
use PHPUnit\Framework\TestCase;
class ApplicationServiceTest extends TestCase
diff --git a/tests/DDDStarterPack/Domain/Service/BasicServiceResponseTest.php b/tests/Unit/DDDStarterPack/Service/Domain/BasicServiceResponseTest.php
similarity index 93%
rename from tests/DDDStarterPack/Domain/Service/BasicServiceResponseTest.php
rename to tests/Unit/DDDStarterPack/Service/Domain/BasicServiceResponseTest.php
index 052b95d..c420411 100644
--- a/tests/DDDStarterPack/Domain/Service/BasicServiceResponseTest.php
+++ b/tests/Unit/DDDStarterPack/Service/Domain/BasicServiceResponseTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Service;
+namespace Tests\Unit\DDDStarterPack\Service\Domain;
-use DDDStarterPack\Domain\Service\Response\BasicServiceResponse;
+use DDDStarterPack\Service\Domain\Response\BasicServiceResponse;
use PHPUnit\Framework\TestCase;
class BasicServiceResponseTest extends TestCase
diff --git a/tests/DDDStarterPack/Domain/Service/CommandServiceTest.php b/tests/Unit/DDDStarterPack/Service/Domain/CommandServiceTest.php
similarity index 90%
rename from tests/DDDStarterPack/Domain/Service/CommandServiceTest.php
rename to tests/Unit/DDDStarterPack/Service/Domain/CommandServiceTest.php
index b79a95d..7c61fbd 100644
--- a/tests/DDDStarterPack/Domain/Service/CommandServiceTest.php
+++ b/tests/Unit/DDDStarterPack/Service/Domain/CommandServiceTest.php
@@ -2,11 +2,11 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Service;
+namespace Tests\Unit\DDDStarterPack\Service\Domain;
use DateTimeImmutable;
-use DDDStarterPack\Domain\Command\DomainCommand;
-use DDDStarterPack\Domain\Service\CommandService;
+use DDDStarterPack\Command\DomainCommand;
+use DDDStarterPack\Service\Domain\CommandService;
use PHPUnit\Framework\TestCase;
class CommandServiceTest extends TestCase
diff --git a/tests/DDDStarterPack/Domain/Service/NoRequestServiceTest.php b/tests/Unit/DDDStarterPack/Service/Domain/NoRequestServiceTest.php
similarity index 87%
rename from tests/DDDStarterPack/Domain/Service/NoRequestServiceTest.php
rename to tests/Unit/DDDStarterPack/Service/Domain/NoRequestServiceTest.php
index 61351e9..00809e7 100644
--- a/tests/DDDStarterPack/Domain/Service/NoRequestServiceTest.php
+++ b/tests/Unit/DDDStarterPack/Service/Domain/NoRequestServiceTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Service;
+namespace Tests\Unit\DDDStarterPack\Service\Domain;
-use DDDStarterPack\Domain\Service\NoRequestService;
+use DDDStarterPack\Service\Domain\NoRequestService;
use PHPUnit\Framework\TestCase;
class NoRequestServiceTest extends TestCase
diff --git a/tests/DDDStarterPack/Domain/Service/ServiceTest.php b/tests/Unit/DDDStarterPack/Service/Domain/ServiceTest.php
similarity index 89%
rename from tests/DDDStarterPack/Domain/Service/ServiceTest.php
rename to tests/Unit/DDDStarterPack/Service/Domain/ServiceTest.php
index a8c8d05..4757122 100644
--- a/tests/DDDStarterPack/Domain/Service/ServiceTest.php
+++ b/tests/Unit/DDDStarterPack/Service/Domain/ServiceTest.php
@@ -2,9 +2,9 @@
declare(strict_types=1);
-namespace Tests\DDDStarterPack\Domain\Service;
+namespace Tests\Unit\DDDStarterPack\Service\Domain;
-use DDDStarterPack\Domain\Service\Service;
+use DDDStarterPack\Service\Domain\Service;
use PHPUnit\Framework\TestCase;
class ServiceTest extends TestCase