Merge branch 'hotfix/move-factories-to-infra' of https://github.com/d…

…anizord/php-ddd-cargo-sample into danizord-hotfix/move-factories-to-infra Conflicts: config/autoload/dependencies.global.php
githoober · Mar 14, 2016 · 26079de · 26079de
2 parents d27e942 + d6f86e8
commit 26079de
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/...plication/Action/BookingActionFactory.php → ...plication/Action/BookingActionFactory.php b/...plication/Action/BookingActionFactory.php → ...plication/Action/BookingActionFactory.php
@@ -8,7 +8,7 @@
  * 
  * Date: 06.12.2015 - 11:13 PM
  */
-namespace Codeliner\CargoBackend\Container\Application\Action;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Action;
 
 use Assert\Assertion;
 use Codeliner\CargoBackend\Application\Booking\BookingService;

diff --git a/...plication/Action/PayloadParserFactory.php → ...plication/Action/PayloadParserFactory.php b/...plication/Action/PayloadParserFactory.php → ...plication/Action/PayloadParserFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Application\Action;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Action;
 
 use Psr7Middlewares\Middleware;
 

diff --git a/...ication/Booking/BookingServiceFactory.php → ...ication/Booking/BookingServiceFactory.php b/...ication/Booking/BookingServiceFactory.php → ...ication/Booking/BookingServiceFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Application\Booking;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Booking;
 
 use Codeliner\CargoBackend\Application\Booking\BookingService;
 use Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager;

diff --git a/...ucture/DoctrineCargoRepositoryFactory.php → ...ucture/DoctrineCargoRepositoryFactory.php b/...ucture/DoctrineCargoRepositoryFactory.php → ...ucture/DoctrineCargoRepositoryFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\DoctrineCargoRepository;
 use Codeliner\CargoBackend\Model\Cargo\Cargo;

diff --git a/...tructure/DoctrineEntityManagerFactory.php → ...tructure/DoctrineEntityManagerFactory.php b/...tructure/DoctrineEntityManagerFactory.php → ...tructure/DoctrineEntityManagerFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\Type\LegsDoctrineType;
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\Type\TrackingIdDoctrineType;

diff --git a/...ructure/ExternalRoutingServiceFactory.php → ...ructure/ExternalRoutingServiceFactory.php b/...ructure/ExternalRoutingServiceFactory.php → ...ructure/ExternalRoutingServiceFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Routing\ExternalRoutingService;
 use Codeliner\GraphTraversalBackend\GraphTraversalServiceInterface;

diff --git a/...rastructure/TransactionManagerFactory.php → ...rastructure/TransactionManagerFactory.php b/...rastructure/TransactionManagerFactory.php → ...rastructure/TransactionManagerFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager;
 use Interop\Container\ContainerInterface;

diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php
@@ -11,27 +11,27 @@
             'Codeliner\CargoBackend' => \Zend\Expressive\Container\ApplicationFactory::class,
 
               //Actions
-            \Codeliner\CargoBackend\Http\Action\GetLocations::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetRouteCandidates::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\CreateCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetCargos::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\UpdateCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetLocations::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetRouteCandidates::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\CreateCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetCargos::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\UpdateCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
 
               //Action Helper middleware
-            \Psr7Middlewares\Middleware\Payload::class => \Codeliner\CargoBackend\Container\Application\Action\PayloadParserFactory::class,
+            \Psr7Middlewares\Middleware\Payload::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\PayloadParserFactory::class,
 
               //Application
-            \Codeliner\CargoBackend\Application\Booking\BookingService::class => \Codeliner\CargoBackend\Container\Application\Booking\BookingServiceFactory::class,
+            \Codeliner\CargoBackend\Application\Booking\BookingService::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Booking\BookingServiceFactory::class,
 
               //Model
-            \Codeliner\CargoBackend\Model\Cargo\CargoRepositoryInterface::class => \Codeliner\CargoBackend\Container\Infrastructure\DoctrineCargoRepositoryFactory::class,
-            \Codeliner\CargoBackend\Model\Routing\RoutingServiceInterface::class => \Codeliner\CargoBackend\Container\Infrastructure\ExternalRoutingServiceFactory::class,
+            \Codeliner\CargoBackend\Model\Cargo\CargoRepositoryInterface::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\DoctrineCargoRepositoryFactory::class,
+            \Codeliner\CargoBackend\Model\Routing\RoutingServiceInterface::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\ExternalRoutingServiceFactory::class,
 
               //Infrastructure
-            'doctrine.entitymanager.orm_default' => \Codeliner\CargoBackend\Container\Infrastructure\DoctrineEntityManagerFactory::class,
+            'doctrine.entitymanager.orm_default' => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\DoctrineEntityManagerFactory::class,
             \Doctrine\ORM\Mapping\UnderscoreNamingStrategy::class => \Zend\ServiceManager\Factory\InvokableFactory::class,
-            \Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager::class => \Codeliner\CargoBackend\Container\Infrastructure\TransactionManagerFactory::class,
+            \Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\TransactionManagerFactory::class,
 
             //GraphTraversalBackend
             \Codeliner\GraphTraversalBackend\GraphTraversalServiceInterface::class => \Codeliner\GraphTraversalBackend\GraphTraversalServiceFactory::class,