chore: change directory structure, move bc on top

bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use App\Infrastructure\Shared\Symfony\Kernel;
+use App\Shared\Infrastructure\Symfony\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
 if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {

config/packages/api_platform.php

@@ -9,7 +9,7 @@
     $containerConfigurator->extension('api_platform', [
         'mapping' => [
             'paths' => [
-                '%kernel.project_dir%/src/Infrastructure/BookStore/ApiPlatform/Resource/',
+                '%kernel.project_dir%/src/BookStore/Infrastructure/ApiPlatform/Resource/',
             ],
         ],
         'patch_formats' => [

config/packages/doctrine.php

@@ -19,8 +19,8 @@
                     'BookStore' => [
                         'is_bundle' => false,
                         'type' => 'attribute',
-                        'dir' => '%kernel.project_dir%/src/Domain/BookStore/Model',
-                        'prefix' => 'App\Domain\BookStore\Model',
+                        'dir' => '%kernel.project_dir%/src/BookStore/Domain/Model',
+                        'prefix' => 'App\BookStore\Domain\Model',
                     ],
                 ],
             ],

config/packages/messenger.php

@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Application\Shared\Command\CommandInterface;
-use App\Application\Shared\Query\QueryInterface;
+use App\Shared\Application\Command\CommandInterface;
+use App\Shared\Application\Query\QueryInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

config/services/book_store.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
-use App\Infrastructure\BookStore\ApiPlatform\State\Processor\AnonymizeBooksProcessor;
-use App\Infrastructure\BookStore\ApiPlatform\State\Processor\BookCrudProcessor;
-use App\Infrastructure\BookStore\ApiPlatform\State\Provider\BookCrudProvider;
-use App\Infrastructure\BookStore\ApiPlatform\State\Processor\DiscountBookProcessor;
-use App\Infrastructure\BookStore\ApiPlatform\State\Provider\CheapestBooksProvider;
-use App\Infrastructure\BookStore\Doctrine\DoctrineBookRepository;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\BookStore\Infrastructure\ApiPlatform\State\Processor\AnonymizeBooksProcessor;
+use App\BookStore\Infrastructure\ApiPlatform\State\Processor\BookCrudProcessor;
+use App\BookStore\Infrastructure\ApiPlatform\State\Processor\DiscountBookProcessor;
+use App\BookStore\Infrastructure\ApiPlatform\State\Provider\BookCrudProvider;
+use App\BookStore\Infrastructure\ApiPlatform\State\Provider\CheapestBooksProvider;
+use App\BookStore\Infrastructure\Doctrine\DoctrineBookRepository;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -18,9 +18,7 @@
         ->autowire()
         ->autoconfigure();
 
-    $services->load('App\\Domain\\BookStore\\', __DIR__.'/../../src/Domain/BookStore');
-    $services->load('App\\Application\\BookStore\\', __DIR__.'/../../src/Application/BookStore');
-    $services->load('App\\Infrastructure\\BookStore\\', __DIR__.'/../../src/Infrastructure/BookStore');
+    $services->load('App\\BookStore\\', __DIR__.'/../../src/BookStore');
 
     // providers
     $services->set(CheapestBooksProvider::class)
@@ -48,4 +46,3 @@
     $services->set(BookRepositoryInterface::class)
         ->class(DoctrineBookRepository::class);
 };
-

config/services/shared.php

@@ -4,17 +4,13 @@
 
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
-
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
 
     $services->defaults()
         ->autowire()
         ->autoconfigure();
 
-    $services->load('App\\Domain\\Shared\\', __DIR__.'/../../src/Domain/Shared');
-    $services->load('App\\Application\\Shared\\', __DIR__.'/../../src/Application/Shared');
-    $services->load('App\\Infrastructure\\Shared\\', __DIR__.'/../../src/Infrastructure/Shared')
-        ->exclude([__DIR__.'/../../src/Infrastructure/Shared/Kernel.php']);
+    $services->load('App\\Shared\\', __DIR__.'/../../src/Shared')
+        ->exclude([__DIR__.'/../../src/Shared/Infrastructure/Kernel.php']);
 };

config/services/test/book_store.php

@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
-use App\Infrastructure\BookStore\InMemory\InMemoryBookRepository;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\BookStore\Infrastructure\InMemory\InMemoryBookRepository;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {

docs/infrastructure/query_providers.md

@@ -25,7 +25,7 @@ As there is one provider per query, each provider must be scoped to handle its r
 This could be done like the following:
 ```php
 use App\Application\[BoundedContext]\Query\MyQuery;
-use App\Infrastructure\Shared\ApiPlatform\Metadata\QueryOperation;
+use App\Shared\Infrastructure\ApiPlatform\Metadata\QueryOperation;
 
 public function supports(string $resourceClass, array $identifiers = [], ?string $operationName = null, array $context = []): bool
 {

phpunit.xml.dist

@@ -11,7 +11,7 @@
   <ini name="display_errors" value="1" />
   <ini name="error_reporting" value="-1" />
   <server name="APP_ENV" value="test" force="true" />
-  <server name="KERNEL_CLASS" value="App\Infrastructure\Shared\Symfony\Kernel" />
+  <server name="KERNEL_CLASS" value="App\Shared\Infrastructure\Symfony\Kernel" />
   <server name="SHELL_VERBOSITY" value="-1" />
   <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
   <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />

public/index.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Infrastructure\Shared\Symfony\Kernel;
+use App\Shared\Infrastructure\Symfony\Kernel;
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 

src/Application/BookStore/Command/AnonymizeBooksCommand.php → src/BookStore/Application/Command/AnonymizeBooksCommand.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandInterface;
+use App\Shared\Application\Command\CommandInterface;
 
 final class AnonymizeBooksCommand implements CommandInterface
 {

src/Application/BookStore/Command/AnonymizeBooksCommandHandler.php → src/BookStore/Application/Command/AnonymizeBooksCommandHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandHandlerInterface;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Command\CommandHandlerInterface;
 
 final class AnonymizeBooksCommandHandler implements CommandHandlerInterface
 {

src/Application/BookStore/Command/CreateBookCommand.php → src/BookStore/Application/Command/CreateBookCommand.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandInterface;
+use App\Shared\Application\Command\CommandInterface;
 use Webmozart\Assert\Assert;
 
 final class CreateBookCommand implements CommandInterface

src/Application/BookStore/Command/CreateBookCommandHandler.php → src/BookStore/Application/Command/CreateBookCommandHandler.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandHandlerInterface;
-use App\Domain\BookStore\Model\Book;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Model\Book;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Command\CommandHandlerInterface;
 
 final class CreateBookCommandHandler implements CommandHandlerInterface
 {

src/Application/BookStore/Command/DeleteBookCommand.php → src/BookStore/Application/Command/DeleteBookCommand.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandInterface;
+use App\Shared\Application\Command\CommandInterface;
 use Symfony\Component\Uid\Uuid;
 
 final class DeleteBookCommand implements CommandInterface

src/Application/BookStore/Command/DeleteBookCommandHandler.php → src/BookStore/Application/Command/DeleteBookCommandHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandHandlerInterface;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Command\CommandHandlerInterface;
 
 final class DeleteBookCommandHandler implements CommandHandlerInterface
 {

src/Application/BookStore/Command/DiscountBookCommand.php → src/BookStore/Application/Command/DiscountBookCommand.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandInterface;
+use App\Shared\Application\Command\CommandInterface;
 use Symfony\Component\Uid\Uuid;
 use Webmozart\Assert\Assert;
 

src/Application/BookStore/Command/DiscountBookCommandHandler.php → src/BookStore/Application/Command/DiscountBookCommandHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandHandlerInterface;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Command\CommandHandlerInterface;
 
 final class DiscountBookCommandHandler implements CommandHandlerInterface
 {

src/Application/BookStore/Command/UpdateBookCommand.php → src/BookStore/Application/Command/UpdateBookCommand.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandInterface;
+use App\Shared\Application\Command\CommandInterface;
 use Symfony\Component\Uid\Uuid;
 use Webmozart\Assert\Assert;
 

src/Application/BookStore/Command/UpdateBookCommandHandler.php → src/BookStore/Application/Command/UpdateBookCommandHandler.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Command;
+namespace App\BookStore\Application\Command;
 
-use App\Application\Shared\Command\CommandHandlerInterface;
-use App\Domain\BookStore\Model\Book;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Model\Book;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Command\CommandHandlerInterface;
 
 final class UpdateBookCommandHandler implements CommandHandlerInterface
 {

src/Application/BookStore/Query/FindBookQuery.php → src/BookStore/Application/Query/FindBookQuery.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryInterface;
+use App\Shared\Application\Query\QueryInterface;
 use Symfony\Component\Uid\Uuid;
 
 final class FindBookQuery implements QueryInterface

src/Application/BookStore/Query/FindBookQueryHandler.php → src/BookStore/Application/Query/FindBookQueryHandler.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryHandlerInterface;
-use App\Domain\BookStore\Model\Book;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Model\Book;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Query\QueryHandlerInterface;
 
 final class FindBookQueryHandler implements QueryHandlerInterface
 {

src/Application/BookStore/Query/FindBooksQuery.php → src/BookStore/Application/Query/FindBooksQuery.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryInterface;
+use App\Shared\Application\Query\QueryInterface;
 
 final class FindBooksQuery implements QueryInterface
 {

src/Application/BookStore/Query/FindBooksQueryHandler.php → src/BookStore/Application/Query/FindBooksQueryHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryHandlerInterface;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Query\QueryHandlerInterface;
 
 final class FindBooksQueryHandler implements QueryHandlerInterface
 {

src/Application/BookStore/Query/FindCheapestBooksQuery.php → src/BookStore/Application/Query/FindCheapestBooksQuery.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryInterface;
+use App\Shared\Application\Query\QueryInterface;
 
 final class FindCheapestBooksQuery implements QueryInterface
 {

src/Application/BookStore/Query/FindCheapestBooksQueryHandler.php → src/BookStore/Application/Query/FindCheapestBooksQueryHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Application\BookStore\Query;
+namespace App\BookStore\Application\Query;
 
-use App\Application\Shared\Query\QueryHandlerInterface;
-use App\Domain\BookStore\Repository\BookRepositoryInterface;
+use App\BookStore\Domain\Repository\BookRepositoryInterface;
+use App\Shared\Application\Query\QueryHandlerInterface;
 
 final class FindCheapestBooksQueryHandler implements QueryHandlerInterface
 {

src/Domain/BookStore/Model/Book.php → src/BookStore/Domain/Model/Book.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Domain\BookStore\Model;
+namespace App\BookStore\Domain\Model;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Uid\Uuid;

src/Domain/BookStore/Repository/BookRepositoryInterface.php → src/BookStore/Domain/Repository/BookRepositoryInterface.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Domain\BookStore\Repository;
+namespace App\BookStore\Domain\Repository;
 
-use App\Domain\BookStore\Model\Book;
-use App\Domain\Shared\Repository\RepositoryInterface;
+use App\BookStore\Domain\Model\Book;
+use App\Shared\Domain\Repository\RepositoryInterface;
 use Symfony\Component\Uid\Uuid;
 
 /**

src/Infrastructure/BookStore/ApiPlatform/OpenApi/AuthorFilter.php → src/BookStore/Infrastructure/ApiPlatform/OpenApi/AuthorFilter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure\BookStore\ApiPlatform\OpenApi;
+namespace App\BookStore\Infrastructure\ApiPlatform\OpenApi;
 
 use ApiPlatform\Core\Api\FilterInterface;
 use Symfony\Component\PropertyInfo\Type;

src/Infrastructure/BookStore/ApiPlatform/Payload/DiscountBookPayload.php → src/BookStore/Infrastructure/ApiPlatform/Payload/DiscountBookPayload.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Infrastructure\BookStore\ApiPlatform\Payload;
+namespace App\BookStore\Infrastructure\ApiPlatform\Payload;
 
 use Symfony\Component\Validator\Constraints as Assert;