move infrastructure related classes in tests under infrastructure ns

albertborsos · Aug 30, 2019 · f7dcec2 · f7dcec2
1 parent 55530a8
commit f7dcec2
Show file tree

Hide file tree

Showing 46 changed files with 77 additions and 77 deletions.
diff --git a/tests/_support/base/domains/customer/entities/CustomerWithBehaviors.php b/tests/_support/base/domains/customer/entities/CustomerWithBehaviors.php
@@ -6,7 +6,7 @@
 use albertborsos\ddd\behaviors\SluggableBehavior;
 use albertborsos\ddd\behaviors\TimestampBehavior;
 use albertborsos\ddd\models\AbstractEntity;
-use albertborsos\ddd\tests\support\base\domains\customer\mysql\CustomerWithBehaviorsActiveRepository;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\CustomerWithBehaviorsActiveRepository;
 
 /**
  * Class Customer

diff --git a/tests/_support/base/domains/page/behaviors/PageSluggableBehavior.php b/tests/_support/base/domains/page/behaviors/PageSluggableBehavior.php
@@ -3,8 +3,8 @@
 namespace albertborsos\ddd\tests\support\base\domains\page\behaviors;
 
 use albertborsos\ddd\behaviors\AbstractUniqueSluggableBehavior;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface;
 
 class PageSluggableBehavior extends AbstractUniqueSluggableBehavior
 {

diff --git a/.../cache/CustomerAddressCacheRepository.php → ...stomer/CustomerAddressCacheRepository.php b/.../cache/CustomerAddressCacheRepository.php → ...stomer/CustomerAddressCacheRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\cache;
+namespace albertborsos\ddd\tests\support\base\infrastructure\cache\customer;
 
 use albertborsos\ddd\repositories\CacheRepository;
 use albertborsos\ddd\tests\support\base\domains\customer\entities\CustomerAddress;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerAddressCacheRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerAddressCacheRepositoryInterface;
 
 class CustomerAddressCacheRepository extends CacheRepository implements CustomerAddressCacheRepositoryInterface
 {

diff --git a/...ustomer/cache/CustomerCacheRepository.php → ...ache/customer/CustomerCacheRepository.php b/...ustomer/cache/CustomerCacheRepository.php → ...ache/customer/CustomerCacheRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\cache;
+namespace albertborsos\ddd\tests\support\base\infrastructure\cache\customer;
 
 use albertborsos\ddd\repositories\CacheRepository;
 use albertborsos\ddd\tests\support\base\domains\customer\entities\Customer;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerCacheRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerCacheRepositoryInterface;
 
 class CustomerCacheRepository extends CacheRepository implements CustomerCacheRepositoryInterface
 {

diff --git a/...ces/CustomerActiveRepositoryInterface.php → ...mer/CustomerActiveRepositoryInterface.php b/...ces/CustomerActiveRepositoryInterface.php → ...mer/CustomerActiveRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer;
 
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 

diff --git a/...tomerAddressActiveRepositoryInterface.php → ...tomerAddressActiveRepositoryInterface.php b/...tomerAddressActiveRepositoryInterface.php → ...tomerAddressActiveRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer;
 
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 

diff --git a/...stomerAddressCacheRepositoryInterface.php → ...stomerAddressCacheRepositoryInterface.php b/...stomerAddressCacheRepositoryInterface.php → ...stomerAddressCacheRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer;
 
 use albertborsos\ddd\interfaces\CacheRepositoryInterface;
 

diff --git a/...aces/CustomerCacheRepositoryInterface.php → ...omer/CustomerCacheRepositoryInterface.php b/...aces/CustomerCacheRepositoryInterface.php → ...omer/CustomerCacheRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer;
 
 use albertborsos\ddd\interfaces\CacheRepositoryInterface;
 

diff --git a/...erfaces/PageActiveRepositoryInterface.php → ...es/page/PageActiveRepositoryInterface.php b/...erfaces/PageActiveRepositoryInterface.php → ...es/page/PageActiveRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\page;
 
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 

diff --git a/...ces/PageSlugActiveRepositoryInterface.php → ...age/PageSlugActiveRepositoryInterface.php b/...ces/PageSlugActiveRepositoryInterface.php → ...age/PageSlugActiveRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\interfaces;
+namespace albertborsos\ddd\tests\support\base\infrastructure\interfaces\page;
 
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 

diff --git a/.../base/domains/customer/mysql/Customer.php → ...nfrastructure/mysql/customer/Customer.php b/.../base/domains/customer/mysql/Customer.php → ...nfrastructure/mysql/customer/Customer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\tests\support\base\domains\customer\traits\CustomerAttributeLabelsTrait;
 

diff --git a/...stomer/mysql/CustomerActiveRepository.php → ...sql/customer/CustomerActiveRepository.php b/...stomer/mysql/CustomerActiveRepository.php → ...sql/customer/CustomerActiveRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 use yii\data\BaseDataProvider;
 
 class CustomerActiveRepository extends AbstractActiveRepository implements CustomerActiveRepositoryInterface

diff --git a/...omains/customer/mysql/CustomerAddress.php → ...ucture/mysql/customer/CustomerAddress.php b/...omains/customer/mysql/CustomerAddress.php → ...ucture/mysql/customer/CustomerAddress.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\tests\support\base\domains\customer\traits\CustomerAddressAttributeLabelsTrait;
 

diff --git a/...mysql/CustomerAddressActiveRepository.php → ...tomer/CustomerAddressActiveRepository.php b/...mysql/CustomerAddressActiveRepository.php → ...tomer/CustomerAddressActiveRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerAddressActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerAddressActiveRepositoryInterface;
 use yii\data\BaseDataProvider;
 
 class CustomerAddressActiveRepository extends AbstractActiveRepository implements CustomerAddressActiveRepositoryInterface

diff --git a/...CustomerWithBehaviorsActiveRepository.php → ...CustomerWithBehaviorsActiveRepository.php b/...CustomerWithBehaviorsActiveRepository.php → ...CustomerWithBehaviorsActiveRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 use yii\data\BaseDataProvider;
 
 class CustomerWithBehaviorsActiveRepository extends CustomerActiveRepository

diff --git a/...WithModifiedBehaviorsActiveRepository.php → ...WithModifiedBehaviorsActiveRepository.php b/...WithModifiedBehaviorsActiveRepository.php → ...WithModifiedBehaviorsActiveRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\interfaces\EntityInterface;
 use yii\base\ModelEvent;

diff --git a/...InvalidEntityCustomerActiveRepository.php → ...InvalidEntityCustomerActiveRepository.php b/...InvalidEntityCustomerActiveRepository.php → ...InvalidEntityCustomerActiveRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 use yii\base\Model;
 use yii\data\BaseDataProvider;
 

diff --git a/...validHydratorCustomerActiveRepository.php → ...validHydratorCustomerActiveRepository.php b/...validHydratorCustomerActiveRepository.php → ...validHydratorCustomerActiveRepository.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\customer\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\customer;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\tests\support\base\InvalidHydrator;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 use yii\base\Model;
 use yii\data\BaseDataProvider;
 

diff --git a/..._support/base/domains/page/mysql/Page.php → ...t/base/infrastructure/mysql/page/Page.php b/..._support/base/domains/page/mysql/Page.php → ...t/base/infrastructure/mysql/page/Page.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 use albertborsos\ddd\tests\support\base\domains\page\traits\PageAttributeLabelsTrait;
 

diff --git a/...mains/page/mysql/PageActiveRepository.php → ...cture/mysql/page/PageActiveRepository.php b/...mains/page/mysql/PageActiveRepository.php → ...cture/mysql/page/PageActiveRepository.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\tests\support\base\domains\page\entities\Page;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
 use yii\data\BaseDataProvider;
 
 class PageActiveRepository extends AbstractActiveRepository implements PageActiveRepositoryInterface
 {
-    protected $dataModelClass = \albertborsos\ddd\tests\support\base\domains\page\mysql\Page::class;
+    protected $dataModelClass = \albertborsos\ddd\tests\support\base\infrastructure\mysql\page\Page::class;
 
     protected $entityClass = \albertborsos\ddd\tests\support\base\domains\page\entities\Page::class;
 

diff --git a/...ort/base/domains/page/mysql/PageQuery.php → ...e/infrastructure/mysql/page/PageQuery.php b/...ort/base/domains/page/mysql/PageQuery.php → ...e/infrastructure/mysql/page/PageQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 /**
  * This is the ActiveQuery class for [[Page]].

diff --git a/...port/base/domains/page/mysql/PageSlug.php → ...se/infrastructure/mysql/page/PageSlug.php b/...port/base/domains/page/mysql/PageSlug.php → ...se/infrastructure/mysql/page/PageSlug.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 use albertborsos\ddd\tests\support\base\domains\page\traits\PageSlugAttributeLabelsTrait;
 

diff --git a/...s/page/mysql/PageSlugActiveRepository.php → ...e/mysql/page/PageSlugActiveRepository.php b/...s/page/mysql/PageSlugActiveRepository.php → ...e/mysql/page/PageSlugActiveRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\data\ActiveEntityDataProvider;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface;
 use yii\data\BaseDataProvider;
 
 class PageSlugActiveRepository extends AbstractActiveRepository implements PageSlugActiveRepositoryInterface

diff --git a/...base/domains/page/mysql/PageSlugQuery.php → ...frastructure/mysql/page/PageSlugQuery.php b/...base/domains/page/mysql/PageSlugQuery.php → ...frastructure/mysql/page/PageSlugQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace albertborsos\ddd\tests\support\base\domains\page\mysql;
+namespace albertborsos\ddd\tests\support\base\infrastructure\mysql\page;
 
 /**
  * This is the ActiveQuery class for [[PageSlug]].

diff --git a/tests/_support/base/services/customer/AbstractCustomerService.php b/tests/_support/base/services/customer/AbstractCustomerService.php
@@ -5,7 +5,7 @@
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 use albertborsos\ddd\models\AbstractActiveService;
 use albertborsos\ddd\tests\support\base\domains\customer\entities\Customer;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 use albertborsos\ddd\tests\support\base\services\customer\forms\AbstractCustomerForm;
 
 abstract class AbstractCustomerService extends AbstractActiveService

diff --git a/tests/_support/base/services/customer/forms/AbstractCustomerForm.php b/tests/_support/base/services/customer/forms/AbstractCustomerForm.php
@@ -6,7 +6,7 @@
 use albertborsos\ddd\interfaces\FormObject;
 use albertborsos\ddd\traits\ActiveFormTrait;
 use albertborsos\ddd\tests\support\base\domains\customer\entities\Customer;
-use albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface;
 
 abstract class AbstractCustomerForm extends Customer implements FormObject
 {

diff --git a/tests/_support/base/services/page/AbstractPageService.php b/tests/_support/base/services/page/AbstractPageService.php
@@ -5,7 +5,7 @@
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 use albertborsos\ddd\models\AbstractActiveService;
 use albertborsos\ddd\tests\support\base\domains\page\entities\Page;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
 use albertborsos\ddd\tests\support\base\services\page\forms\AbstractPageForm;
 
 abstract class AbstractPageService extends AbstractActiveService

diff --git a/tests/_support/base/services/page/AbstractPageSlugService.php b/tests/_support/base/services/page/AbstractPageSlugService.php
@@ -5,7 +5,7 @@
 use albertborsos\ddd\interfaces\ActiveRepositoryInterface;
 use albertborsos\ddd\models\AbstractActiveService;
 use albertborsos\ddd\tests\support\base\domains\page\entities\PageSlug;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface;
 use albertborsos\ddd\tests\support\base\services\page\forms\AbstractPageSlugForm;
 
 abstract class AbstractPageSlugService extends AbstractActiveService

diff --git a/tests/_support/base/services/page/DeletePageService.php b/tests/_support/base/services/page/DeletePageService.php
@@ -3,8 +3,8 @@
 namespace albertborsos\ddd\tests\support\base\services\page;
 
 use albertborsos\ddd\tests\support\base\domains\page\entities\Page;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageImageActiveRepositoryInterface;
-use albertborsos\ddd\tests\support\base\domains\page\mysql\PageImageActiveRepository;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageImageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\page\PageImageActiveRepository;
 use albertborsos\ddd\tests\support\base\services\page\forms\DeletePageForm;
 
 class DeletePageService extends AbstractPageService

diff --git a/tests/_support/base/services/page/forms/AbstractPageForm.php b/tests/_support/base/services/page/forms/AbstractPageForm.php
@@ -6,7 +6,7 @@
 use albertborsos\ddd\interfaces\FormObject;
 use albertborsos\ddd\traits\ActiveFormTrait;
 use albertborsos\ddd\tests\support\base\domains\page\entities\Page;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
 
 abstract class AbstractPageForm extends Page implements FormObject
 {

diff --git a/tests/_support/base/services/page/forms/AbstractPageSlugForm.php b/tests/_support/base/services/page/forms/AbstractPageSlugForm.php
@@ -6,8 +6,8 @@
 use albertborsos\ddd\interfaces\FormObject;
 use albertborsos\ddd\traits\ActiveFormTrait;
 use albertborsos\ddd\tests\support\base\domains\page\entities\PageSlug;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
 
 abstract class AbstractPageSlugForm extends PageSlug implements FormObject
 {

diff --git a/tests/config/main.php b/tests/config/main.php
@@ -19,12 +19,12 @@
     'container' => [
         'definitions' => [
             \albertborsos\ddd\interfaces\HydratorInterface::class => \albertborsos\ddd\hydrators\ActiveHydrator::class,
-            \albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\customer\mysql\CustomerActiveRepository::class,
-            \albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerCacheRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\customer\cache\CustomerCacheRepository::class,
-            \albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerAddressActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\customer\mysql\CustomerAddressActiveRepository::class,
-            \albertborsos\ddd\tests\support\base\domains\customer\interfaces\CustomerAddressCacheRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\customer\cache\CustomerAddressCacheRepository::class,
-            \albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\page\mysql\PageActiveRepository::class,
-            \albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\domains\page\mysql\PageSlugActiveRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\CustomerActiveRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerCacheRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\cache\customer\CustomerCacheRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerAddressActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\CustomerAddressActiveRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\customer\CustomerAddressCacheRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\cache\customer\CustomerAddressCacheRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\mysql\page\PageActiveRepository::class,
+            \albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface::class => \albertborsos\ddd\tests\support\base\infrastructure\mysql\page\PageSlugActiveRepository::class,
         ],
     ],
 ];

diff --git a/tests/fixtures/CustomerFixtures.php b/tests/fixtures/CustomerFixtures.php
@@ -2,7 +2,7 @@
 
 namespace albertborsos\ddd\tests\fixtures;
 
-use albertborsos\ddd\tests\support\base\domains\customer\mysql\Customer;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\Customer;
 use yii\test\ActiveFixture;
 
 class CustomerFixtures extends ActiveFixture

diff --git a/tests/fixtures/CustomerWithBehaviorsFixtures.php b/tests/fixtures/CustomerWithBehaviorsFixtures.php
@@ -2,7 +2,7 @@
 
 namespace albertborsos\ddd\tests\fixtures;
 
-use albertborsos\ddd\tests\support\base\domains\customer\mysql\Customer;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\Customer;
 use yii\test\ActiveFixture;
 
 class CustomerWithBehaviorsFixtures extends ActiveFixture

diff --git a/tests/fixtures/PageFixture.php b/tests/fixtures/PageFixture.php
@@ -2,7 +2,7 @@
 
 namespace albertborsos\ddd\tests\fixtures;
 
-use albertborsos\ddd\tests\support\base\domains\page\mysql\Page;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\page\Page;
 use yii\test\ActiveFixture;
 
 class PageFixture extends ActiveFixture

diff --git a/tests/fixtures/PageSlugFixture.php b/tests/fixtures/PageSlugFixture.php
@@ -2,7 +2,7 @@
 
 namespace albertborsos\ddd\tests\fixtures;
 
-use albertborsos\ddd\tests\support\base\domains\page\mysql\PageSlug;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\page\PageSlug;
 use yii\test\ActiveFixture;
 
 class PageSlugFixture extends ActiveFixture

diff --git a/tests/unit/behaviors/AbstractUniqueSluggableBehaviorTest.php b/tests/unit/behaviors/AbstractUniqueSluggableBehaviorTest.php
@@ -5,8 +5,8 @@
 use albertborsos\ddd\interfaces\EntityInterface;
 use albertborsos\ddd\tests\support\base\domains\page\entities\Page;
 use albertborsos\ddd\tests\support\base\domains\page\entities\PageSlug;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageActiveRepositoryInterface;
-use albertborsos\ddd\tests\support\base\domains\page\interfaces\PageSlugActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageActiveRepositoryInterface;
+use albertborsos\ddd\tests\support\base\infrastructure\interfaces\page\PageSlugActiveRepositoryInterface;
 use albertborsos\ddd\tests\support\base\services\page\AbstractPageService;
 use albertborsos\ddd\tests\support\base\services\page\CreatePageService;
 use albertborsos\ddd\tests\support\base\services\page\forms\CreatePageForm;

diff --git a/tests/unit/behaviors/BlameableBehaviorTest.php b/tests/unit/behaviors/BlameableBehaviorTest.php
@@ -5,8 +5,8 @@
 use albertborsos\ddd\repositories\AbstractActiveRepository;
 use albertborsos\ddd\tests\fixtures\CustomerWithBehaviorsFixtures;
 use albertborsos\ddd\tests\support\base\domains\customer\entities\CustomerWithBehaviors;
-use albertborsos\ddd\tests\support\base\domains\customer\mysql\CustomerWithBehaviorsActiveRepository;
-use albertborsos\ddd\tests\support\base\domains\customer\mysql\CustomerWithModifiedBehaviorsActiveRepository;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\CustomerWithBehaviorsActiveRepository;
+use albertborsos\ddd\tests\support\base\infrastructure\mysql\customer\CustomerWithModifiedBehaviorsActiveRepository;
 use Codeception\PHPUnit\TestCase;
 use yii\test\FixtureTrait;