diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index d6dd4fae..8b16f0a0 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -5,6 +5,7 @@ $finder = PhpCsFixer\Finder::create() ->files() ->name('*.php') + ->in(__DIR__ . '/config') ->in(__DIR__ . '/src') ->in(__DIR__ . '/tests') ; diff --git a/README.md b/README.md index bdbe0068..22978f25 100644 --- a/README.md +++ b/README.md @@ -96,44 +96,49 @@ composer setup:dev Collections are sortable, filterable paginated lists of models. - * [App\Collection][60] + * [App\Core\Collection][60] + * [App\Pet\Collection][61] ### Dto A DTO, or Data Transfer Object, is a simple object used to transport data between software application components. - * [App\Dto][70] + * [App\Core\Dto][70] + * [App\Pet\Dto][71] ### Middleware Middleware functions can execute code, make changes to the request and response objects. Middleware can generally be added globally or on a per-route basis. - * [App\Middleware][80] + * [App\Core\Middleware][80] ### Model Models, entities, documents what ever fits your purpose the best. - * [App\Model][90] + * [App\Core\Model][90] + * [App\Pet\Model][91] ### ORM ORM Mapping definitions. - * [App\ORM][100] + * [App\Pet\Orm][100] ### Parsing Parses and validates data against predefined schemas, ensuring that incoming data conforms to expected structures and criteria. - * [App\Parsing][110] + * [App\Core\Parsing][110] + * [App\Pet\Parsing][111] ### Repository Repositories get data from storages like databases, elasticsearch, redis or whereever your models are stored or cached. - * [App\Repository][120] + * [App\Core\Repository][120] + * [App\Pet\Repository][121] ### RequestHandler @@ -141,13 +146,14 @@ RequestHandler alias Controller, or Controller actions to be more precise. There is a directory with generic crud controllers. If you like the idea adapt them for your generic use case, if not drop them. I highly recommend to not extend them. - * [App\RequestHandler][130] + * [App\Core\RequestHandler][130] ### ServiceFactory Service factories are the glue code of the dependeny injection container. - * [App\ServiceFactory][140] + * [App\Core\ServiceFactory][140] + * [App\Pet\ServiceFactory][141] ## Opensearch @@ -215,22 +221,26 @@ curl -XPUT 'https://admin:98T722Eqw99oqFCSJCnB@localhost:9200/_plugins/_ism/poli [16]: https://packagist.org/packages/symfony/console [17]: https://packagist.org/packages/symfony/var-exporter -[40]: https://packagist.org/packages/chubbyphp/petstore +[60]: src/Core/Collection +[61]: src/Pet/Collection -[60]: src/Collection +[70]: src/Core/Dto +[71]: src/Pet/Dto -[70]: src/Dto +[80]: src/Core/Middleware -[80]: src/Middleware +[90]: src/Core/Model +[91]: src/Pet/Model -[90]: src/Model +[100]: src/Pet/Orm -[100]: src/Orm +[110]: src/Core/Parsing +[111]: src/Pet/Parsing -[110]: src/Parsing +[120]: src/Core/Repository +[121]: src/Pet/Repository -[120]: src/Repository +[130]: src/Core/RequestHandler -[130]: src/RequestHandler - -[140]: src/ServiceFactory +[140]: src/Core/ServiceFactory +[141]: src/Pet/ServiceFactory diff --git a/config/prod.php b/config/prod.php index 518c75a4..a4d02afa 100644 --- a/config/prod.php +++ b/config/prod.php @@ -2,45 +2,45 @@ declare(strict_types=1); -use App\Middleware\ApiExceptionMiddleware; -use App\Middleware\ConvertHttpExceptionMiddleware; -use App\Model\Pet; -use App\Model\Vaccination; -use App\Orm\PetMapping; -use App\Orm\VaccinationMapping; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\CreateRequestHandler; -use App\RequestHandler\Api\Crud\DeleteRequestHandler; -use App\RequestHandler\Api\Crud\ListRequestHandler; -use App\RequestHandler\Api\Crud\ReadRequestHandler; -use App\RequestHandler\Api\Crud\UpdateRequestHandler; -use App\RequestHandler\OpenapiRequestHandler; -use App\RequestHandler\PingRequestHandler; -use App\ServiceFactory\Command\CommandsFactory; -use App\ServiceFactory\DecodeEncode\TypeDecodersFactory; -use App\ServiceFactory\DecodeEncode\TypeEncodersFactory; -use App\ServiceFactory\Framework\CallableResolverFactory; -use App\ServiceFactory\Framework\InvocationStrategyFactory; -use App\ServiceFactory\Framework\RouteCollectorFactory; -use App\ServiceFactory\Framework\RouteParserFactory; -use App\ServiceFactory\Http\ResponseFactoryFactory; -use App\ServiceFactory\Http\StreamFactoryFactory; -use App\ServiceFactory\Logger\LoggerFactory; -use App\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory; -use App\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory; -use App\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory; -use App\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory; -use App\ServiceFactory\Parsing\ParserFactory; -use App\ServiceFactory\Parsing\PetParsingFactory; -use App\ServiceFactory\Repository\PetRepositoryFactory; -use App\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory; -use App\ServiceFactory\RequestHandler\PingRequestHandlerFactory; +use App\Core\Middleware\ApiExceptionMiddleware; +use App\Core\Middleware\ConvertHttpExceptionMiddleware; +use App\Core\RequestHandler\Api\Crud\CreateRequestHandler; +use App\Core\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Core\RequestHandler\Api\Crud\ListRequestHandler; +use App\Core\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Core\RequestHandler\Api\Crud\UpdateRequestHandler; +use App\Core\RequestHandler\OpenapiRequestHandler; +use App\Core\RequestHandler\PingRequestHandler; +use App\Core\ServiceFactory\Command\CommandsFactory; +use App\Core\ServiceFactory\DecodeEncode\TypeDecodersFactory; +use App\Core\ServiceFactory\DecodeEncode\TypeEncodersFactory; +use App\Core\ServiceFactory\Framework\CallableResolverFactory; +use App\Core\ServiceFactory\Framework\InvocationStrategyFactory; +use App\Core\ServiceFactory\Framework\RouteCollectorFactory; +use App\Core\ServiceFactory\Framework\RouteParserFactory; +use App\Core\ServiceFactory\Http\ResponseFactoryFactory; +use App\Core\ServiceFactory\Http\StreamFactoryFactory; +use App\Core\ServiceFactory\Logger\LoggerFactory; +use App\Core\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory; +use App\Core\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory; +use App\Core\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory; +use App\Core\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory; +use App\Core\ServiceFactory\Parsing\ParserFactory; +use App\Core\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory; +use App\Core\ServiceFactory\RequestHandler\PingRequestHandlerFactory; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; +use App\Pet\Orm\PetMapping; +use App\Pet\Orm\VaccinationMapping; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\Parsing\PetParsingFactory; +use App\Pet\ServiceFactory\Repository\PetRepositoryFactory; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory; use Chubbyphp\Cors\CorsMiddleware; use Chubbyphp\Cors\ServiceFactory\CorsMiddlewareFactory; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; @@ -66,6 +66,7 @@ use Chubbyphp\Parsing\ParserInterface; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Tools\Console\ConnectionProvider; +use Doctrine\DBAL\Tools\DsnParser; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\Console\EntityManagerProvider; @@ -80,11 +81,10 @@ use Slim\Interfaces\RouteCollectorInterface; use Slim\Interfaces\RouteParserInterface; use Symfony\Component\Console\Command\Command; -use Doctrine\DBAL\Tools\DsnParser; -$rootDir = \realpath(__DIR__ . '/..'); -$cacheDir = $rootDir . '/var/cache/' . $env; -$logDir = $rootDir . '/var/log'; +$rootDir = realpath(__DIR__.'/..'); +$cacheDir = $rootDir.'/var/cache/'.$env; +$logDir = $rootDir.'/var/log'; return [ 'chubbyphp' => [ @@ -104,16 +104,16 @@ ], 'factories' => [ AcceptMiddleware::class => AcceptMiddlewareFactory::class, - AcceptNegotiatorInterface::class . 'supportedMediaTypes[]' => AcceptNegotiatorSupportedMediaTypesFactory::class, + AcceptNegotiatorInterface::class.'supportedMediaTypes[]' => AcceptNegotiatorSupportedMediaTypesFactory::class, AcceptNegotiatorInterface::class => AcceptNegotiatorFactory::class, ApiExceptionMiddleware::class => ApiExceptionMiddlewareFactory::class, CacheItemPoolInterface::class => ApcuAdapterFactory::class, CallableResolverInterface::class => CallableResolverFactory::class, - Command::class . '[]' => CommandsFactory::class, + Command::class.'[]' => CommandsFactory::class, Connection::class => ConnectionFactory::class, ConnectionProvider::class => ContainerConnectionProviderFactory::class, ContentTypeMiddleware::class => ContentTypeMiddlewareFactory::class, - ContentTypeNegotiatorInterface::class . 'supportedMediaTypes[]' => ContentTypeNegotiatorSupportedMediaTypesFactory::class, + ContentTypeNegotiatorInterface::class.'supportedMediaTypes[]' => ContentTypeNegotiatorSupportedMediaTypesFactory::class, ContentTypeNegotiatorInterface::class => ContentTypeNegotiatorFactory::class, ConvertHttpExceptionMiddleware::class => ConvertHttpExceptionMiddlewareFactory::class, CorsMiddleware::class => CorsMiddlewareFactory::class, @@ -126,11 +126,11 @@ MappingDriver::class => ClassMapDriverFactory::class, OpenapiRequestHandler::class => OpenapiRequestHandlerFactory::class, ParserInterface::class => ParserFactory::class, - Pet::class . CreateRequestHandler::class => PetCreateRequestHandlerFactory::class, - Pet::class . DeleteRequestHandler::class => PetDeleteRequestHandlerFactory::class, - Pet::class . ListRequestHandler::class => PetListRequestHandlerFactory::class, - Pet::class . ReadRequestHandler::class => PetReadRequestHandlerFactory::class, - Pet::class . UpdateRequestHandler::class => PetUpdateRequestHandlerFactory::class, + Pet::class.CreateRequestHandler::class => PetCreateRequestHandlerFactory::class, + Pet::class.DeleteRequestHandler::class => PetDeleteRequestHandlerFactory::class, + Pet::class.ListRequestHandler::class => PetListRequestHandlerFactory::class, + Pet::class.ReadRequestHandler::class => PetReadRequestHandlerFactory::class, + Pet::class.UpdateRequestHandler::class => PetUpdateRequestHandlerFactory::class, PetParsing::class => PetParsingFactory::class, PetRepository::class => PetRepositoryFactory::class, PingRequestHandler::class => PingRequestHandlerFactory::class, @@ -139,10 +139,10 @@ RouteParserInterface::class => RouteParserFactory::class, StreamFactoryInterface::class => StreamFactoryFactory::class, StreamFactoryInterface::class => StreamFactoryFactory::class, - TypeDecoderInterface::class . '[]' => TypeDecodersFactory::class, - TypeDecoderInterface::class . '[]' => TypeDecodersFactory::class, - TypeEncoderInterface::class . '[]' => TypeEncodersFactory::class, - TypeEncoderInterface::class . '[]' => TypeEncodersFactory::class, + TypeDecoderInterface::class.'[]' => TypeDecodersFactory::class, + TypeDecoderInterface::class.'[]' => TypeDecodersFactory::class, + TypeEncoderInterface::class.'[]' => TypeEncodersFactory::class, + TypeEncoderInterface::class.'[]' => TypeEncodersFactory::class, ], ], 'directories' => [ @@ -169,18 +169,18 @@ 'orm' => [ 'configuration' => [ 'metadataDriverImpl' => MappingDriver::class, - 'proxyDir' => $cacheDir . '/doctrine/orm/proxies', + 'proxyDir' => $cacheDir.'/doctrine/orm/proxies', 'proxyNamespace' => 'DoctrineORMProxy', 'metadataCache' => CacheItemPoolInterface::class, ], ], ], 'fastroute' => [ - 'cache' => $cacheDir . '/router-cache.php', + 'cache' => $cacheDir.'/router-cache.php', ], 'monolog' => [ 'name' => 'petstore', - 'path' => $logDir . '/application.log', + 'path' => $logDir.'/application.log', 'level' => Level::Notice, ], ]; diff --git a/src/Collection/AbstractCollection.php b/src/Core/Collection/AbstractCollection.php similarity index 97% rename from src/Collection/AbstractCollection.php rename to src/Core/Collection/AbstractCollection.php index 28f8e346..b733c2e1 100644 --- a/src/Collection/AbstractCollection.php +++ b/src/Core/Collection/AbstractCollection.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Collection; +namespace App\Core\Collection; -use App\Model\ModelInterface; +use App\Core\Model\ModelInterface; abstract class AbstractCollection implements CollectionInterface { diff --git a/src/Collection/CollectionInterface.php b/src/Core/Collection/CollectionInterface.php similarity index 93% rename from src/Collection/CollectionInterface.php rename to src/Core/Collection/CollectionInterface.php index 632b81b0..a6868001 100644 --- a/src/Collection/CollectionInterface.php +++ b/src/Core/Collection/CollectionInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Collection; +namespace App\Core\Collection; -use App\Model\ModelInterface; +use App\Core\Model\ModelInterface; interface CollectionInterface extends \JsonSerializable { diff --git a/src/Dto/Collection/AbstractCollectionResponse.php b/src/Core/Dto/Collection/AbstractCollectionResponse.php similarity index 94% rename from src/Dto/Collection/AbstractCollectionResponse.php rename to src/Core/Dto/Collection/AbstractCollectionResponse.php index 68b39f23..6eeeceba 100644 --- a/src/Dto/Collection/AbstractCollectionResponse.php +++ b/src/Core/Dto/Collection/AbstractCollectionResponse.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Core\Dto\Collection; -use App\Dto\Model\ModelResponseInterface; +use App\Core\Dto\Model\ModelResponseInterface; abstract class AbstractCollectionResponse implements CollectionResponseInterface { @@ -51,13 +51,13 @@ abstract class AbstractCollectionResponse implements CollectionResponseInterface * ... * }>, * count: int, + * _type: string, * _links: array, * attributes: array - * }>, - * _type: string + * }> * } */ final public function jsonSerialize(): array diff --git a/src/Dto/Collection/CollectionFiltersInterface.php b/src/Core/Dto/Collection/CollectionFiltersInterface.php similarity index 85% rename from src/Dto/Collection/CollectionFiltersInterface.php rename to src/Core/Dto/Collection/CollectionFiltersInterface.php index 45240559..19e980a4 100644 --- a/src/Dto/Collection/CollectionFiltersInterface.php +++ b/src/Core/Dto/Collection/CollectionFiltersInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Core\Dto\Collection; interface CollectionFiltersInterface extends \JsonSerializable { diff --git a/src/Dto/Collection/CollectionRequestInterface.php b/src/Core/Dto/Collection/CollectionRequestInterface.php similarity index 63% rename from src/Dto/Collection/CollectionRequestInterface.php rename to src/Core/Dto/Collection/CollectionRequestInterface.php index 7b4c09c1..e43bbdfd 100644 --- a/src/Dto/Collection/CollectionRequestInterface.php +++ b/src/Core/Dto/Collection/CollectionRequestInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Core\Dto\Collection; -use App\Collection\CollectionInterface; +use App\Core\Collection\CollectionInterface; interface CollectionRequestInterface { diff --git a/src/Dto/Collection/CollectionResponseInterface.php b/src/Core/Dto/Collection/CollectionResponseInterface.php similarity index 96% rename from src/Dto/Collection/CollectionResponseInterface.php rename to src/Core/Dto/Collection/CollectionResponseInterface.php index d01e85f5..81990b17 100644 --- a/src/Dto/Collection/CollectionResponseInterface.php +++ b/src/Core/Dto/Collection/CollectionResponseInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Core\Dto\Collection; interface CollectionResponseInterface extends \JsonSerializable { diff --git a/src/Dto/Collection/CollectionSortInterface.php b/src/Core/Dto/Collection/CollectionSortInterface.php similarity index 85% rename from src/Dto/Collection/CollectionSortInterface.php rename to src/Core/Dto/Collection/CollectionSortInterface.php index d3b27fda..93b5e075 100644 --- a/src/Dto/Collection/CollectionSortInterface.php +++ b/src/Core/Dto/Collection/CollectionSortInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Core\Dto\Collection; interface CollectionSortInterface extends \JsonSerializable { diff --git a/src/Dto/Model/ModelRequestInterface.php b/src/Core/Dto/Model/ModelRequestInterface.php similarity index 75% rename from src/Dto/Model/ModelRequestInterface.php rename to src/Core/Dto/Model/ModelRequestInterface.php index 3f4d377f..0ce92b8e 100644 --- a/src/Dto/Model/ModelRequestInterface.php +++ b/src/Core/Dto/Model/ModelRequestInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Core\Dto\Model; -use App\Model\ModelInterface; +use App\Core\Model\ModelInterface; interface ModelRequestInterface { diff --git a/src/Dto/Model/ModelResponseInterface.php b/src/Core/Dto/Model/ModelResponseInterface.php similarity index 94% rename from src/Dto/Model/ModelResponseInterface.php rename to src/Core/Dto/Model/ModelResponseInterface.php index fe864635..84dff0f3 100644 --- a/src/Dto/Model/ModelResponseInterface.php +++ b/src/Core/Dto/Model/ModelResponseInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Core\Dto\Model; interface ModelResponseInterface extends \JsonSerializable { diff --git a/src/Middleware/ApiExceptionMiddleware.php b/src/Core/Middleware/ApiExceptionMiddleware.php similarity index 99% rename from src/Middleware/ApiExceptionMiddleware.php rename to src/Core/Middleware/ApiExceptionMiddleware.php index 9fe576cb..21d0aa80 100644 --- a/src/Middleware/ApiExceptionMiddleware.php +++ b/src/Core/Middleware/ApiExceptionMiddleware.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Middleware; +namespace App\Core\Middleware; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; diff --git a/src/Middleware/ConvertHttpExceptionMiddleware.php b/src/Core/Middleware/ConvertHttpExceptionMiddleware.php similarity index 96% rename from src/Middleware/ConvertHttpExceptionMiddleware.php rename to src/Core/Middleware/ConvertHttpExceptionMiddleware.php index 17fddbd8..eb1fd4cb 100644 --- a/src/Middleware/ConvertHttpExceptionMiddleware.php +++ b/src/Core/Middleware/ConvertHttpExceptionMiddleware.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Middleware; +namespace App\Core\Middleware; use Chubbyphp\HttpException\HttpException as ChubbyphpHttpException; use Psr\Http\Message\ResponseInterface; diff --git a/src/Model/ModelInterface.php b/src/Core/Model/ModelInterface.php similarity index 93% rename from src/Model/ModelInterface.php rename to src/Core/Model/ModelInterface.php index 4c4dcd29..83ab0837 100644 --- a/src/Model/ModelInterface.php +++ b/src/Core/Model/ModelInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Model; +namespace App\Core\Model; interface ModelInterface extends \JsonSerializable { diff --git a/src/Parsing/ParsingInterface.php b/src/Core/Parsing/ParsingInterface.php similarity index 95% rename from src/Parsing/ParsingInterface.php rename to src/Core/Parsing/ParsingInterface.php index 32c896e1..5d06a404 100644 --- a/src/Parsing/ParsingInterface.php +++ b/src/Core/Parsing/ParsingInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Parsing; +namespace App\Core\Parsing; use Chubbyphp\Parsing\Schema\ObjectSchemaInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/src/Repository/RepositoryInterface.php b/src/Core/Repository/RepositoryInterface.php similarity index 76% rename from src/Repository/RepositoryInterface.php rename to src/Core/Repository/RepositoryInterface.php index 29e91a88..f137fdd2 100644 --- a/src/Repository/RepositoryInterface.php +++ b/src/Core/Repository/RepositoryInterface.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Repository; +namespace App\Core\Repository; -use App\Collection\CollectionInterface; -use App\Model\ModelInterface; +use App\Core\Collection\CollectionInterface; +use App\Core\Model\ModelInterface; interface RepositoryInterface { diff --git a/src/RequestHandler/Api/Crud/CreateRequestHandler.php b/src/Core/RequestHandler/Api/Crud/CreateRequestHandler.php similarity index 90% rename from src/RequestHandler/Api/Crud/CreateRequestHandler.php rename to src/Core/RequestHandler/Api/Crud/CreateRequestHandler.php index 990501c9..3f903df0 100644 --- a/src/RequestHandler/Api/Crud/CreateRequestHandler.php +++ b/src/Core/RequestHandler/Api/Crud/CreateRequestHandler.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\RequestHandler\Api\Crud; +namespace App\Core\RequestHandler\Api\Crud; -use App\Dto\Model\ModelRequestInterface; -use App\Dto\Model\ModelResponseInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; +use App\Core\Dto\Model\ModelRequestInterface; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; diff --git a/src/RequestHandler/Api/Crud/DeleteRequestHandler.php b/src/Core/RequestHandler/Api/Crud/DeleteRequestHandler.php similarity index 92% rename from src/RequestHandler/Api/Crud/DeleteRequestHandler.php rename to src/Core/RequestHandler/Api/Crud/DeleteRequestHandler.php index 000b560d..dd3eab9d 100644 --- a/src/RequestHandler/Api/Crud/DeleteRequestHandler.php +++ b/src/Core/RequestHandler/Api/Crud/DeleteRequestHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\RequestHandler\Api\Crud; +namespace App\Core\RequestHandler\Api\Crud; -use App\Repository\RepositoryInterface; +use App\Core\Repository\RepositoryInterface; use Chubbyphp\HttpException\HttpException; use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseInterface; diff --git a/src/RequestHandler/Api/Crud/ListRequestHandler.php b/src/Core/RequestHandler/Api/Crud/ListRequestHandler.php similarity index 88% rename from src/RequestHandler/Api/Crud/ListRequestHandler.php rename to src/Core/RequestHandler/Api/Crud/ListRequestHandler.php index 7d5c2f6c..6d5e08f0 100644 --- a/src/RequestHandler/Api/Crud/ListRequestHandler.php +++ b/src/Core/RequestHandler/Api/Crud/ListRequestHandler.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\RequestHandler\Api\Crud; +namespace App\Core\RequestHandler\Api\Crud; -use App\Dto\Collection\CollectionRequestInterface; -use App\Dto\Collection\CollectionResponseInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; +use App\Core\Dto\Collection\CollectionRequestInterface; +use App\Core\Dto\Collection\CollectionResponseInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; use Chubbyphp\Parsing\ErrorsException; diff --git a/src/RequestHandler/Api/Crud/ReadRequestHandler.php b/src/Core/RequestHandler/Api/Crud/ReadRequestHandler.php similarity index 89% rename from src/RequestHandler/Api/Crud/ReadRequestHandler.php rename to src/Core/RequestHandler/Api/Crud/ReadRequestHandler.php index 2a6726ab..fb20837d 100644 --- a/src/RequestHandler/Api/Crud/ReadRequestHandler.php +++ b/src/Core/RequestHandler/Api/Crud/ReadRequestHandler.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\RequestHandler\Api\Crud; +namespace App\Core\RequestHandler\Api\Crud; -use App\Dto\Model\ModelResponseInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/RequestHandler/Api/Crud/UpdateRequestHandler.php b/src/Core/RequestHandler/Api/Crud/UpdateRequestHandler.php similarity index 90% rename from src/RequestHandler/Api/Crud/UpdateRequestHandler.php rename to src/Core/RequestHandler/Api/Crud/UpdateRequestHandler.php index acba5a1d..bf993099 100644 --- a/src/RequestHandler/Api/Crud/UpdateRequestHandler.php +++ b/src/Core/RequestHandler/Api/Crud/UpdateRequestHandler.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\RequestHandler\Api\Crud; +namespace App\Core\RequestHandler\Api\Crud; -use App\Dto\Model\ModelRequestInterface as ModelModelRequestInterface; -use App\Dto\Model\ModelResponseInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; +use App\Core\Dto\Model\ModelRequestInterface as ModelModelRequestInterface; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; diff --git a/src/RequestHandler/OpenapiRequestHandler.php b/src/Core/RequestHandler/OpenapiRequestHandler.php similarity index 93% rename from src/RequestHandler/OpenapiRequestHandler.php rename to src/Core/RequestHandler/OpenapiRequestHandler.php index 745bd122..bdbcf61a 100644 --- a/src/RequestHandler/OpenapiRequestHandler.php +++ b/src/Core/RequestHandler/OpenapiRequestHandler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\RequestHandler; +namespace App\Core\RequestHandler; use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseInterface; @@ -25,7 +25,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface ->withHeader('Cache-Control', 'no-cache, no-store, must-revalidate') ->withHeader('Pragma', 'no-cache') ->withHeader('Expires', '0') - ->withBody($this->streamFactory->createStreamFromFile(__DIR__.'/../../openapi.yml')) + ->withBody($this->streamFactory->createStreamFromFile(__DIR__.'/../../../openapi.yml')) ; } } diff --git a/src/RequestHandler/PingRequestHandler.php b/src/Core/RequestHandler/PingRequestHandler.php similarity index 96% rename from src/RequestHandler/PingRequestHandler.php rename to src/Core/RequestHandler/PingRequestHandler.php index de7797a6..18419fea 100644 --- a/src/RequestHandler/PingRequestHandler.php +++ b/src/Core/RequestHandler/PingRequestHandler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\RequestHandler; +namespace App\Core\RequestHandler; use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseInterface; diff --git a/src/ServiceFactory/Command/CommandsFactory.php b/src/Core/ServiceFactory/Command/CommandsFactory.php similarity index 98% rename from src/ServiceFactory/Command/CommandsFactory.php rename to src/Core/ServiceFactory/Command/CommandsFactory.php index b90b17df..a7beca04 100644 --- a/src/ServiceFactory/Command/CommandsFactory.php +++ b/src/Core/ServiceFactory/Command/CommandsFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Command; +namespace App\Core\ServiceFactory\Command; use Chubbyphp\CleanDirectories\ServiceFactory\CleanDirectoriesCommandFactory; use Chubbyphp\Laminas\Config\Doctrine\DBAL\Tools\Console\Command\Database\CreateCommand as DatabaseCreateCommand; diff --git a/src/ServiceFactory/DecodeEncode/TypeDecodersFactory.php b/src/Core/ServiceFactory/DecodeEncode/TypeDecodersFactory.php similarity index 92% rename from src/ServiceFactory/DecodeEncode/TypeDecodersFactory.php rename to src/Core/ServiceFactory/DecodeEncode/TypeDecodersFactory.php index efaa0cb8..bb96e4a0 100644 --- a/src/ServiceFactory/DecodeEncode/TypeDecodersFactory.php +++ b/src/Core/ServiceFactory/DecodeEncode/TypeDecodersFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\DecodeEncode; +namespace App\Core\ServiceFactory\DecodeEncode; use Chubbyphp\DecodeEncode\Decoder\JsonTypeDecoder; use Chubbyphp\DecodeEncode\Decoder\JsonxTypeDecoder; diff --git a/src/ServiceFactory/DecodeEncode/TypeEncodersFactory.php b/src/Core/ServiceFactory/DecodeEncode/TypeEncodersFactory.php similarity index 94% rename from src/ServiceFactory/DecodeEncode/TypeEncodersFactory.php rename to src/Core/ServiceFactory/DecodeEncode/TypeEncodersFactory.php index 109e5851..ae5726e0 100644 --- a/src/ServiceFactory/DecodeEncode/TypeEncodersFactory.php +++ b/src/Core/ServiceFactory/DecodeEncode/TypeEncodersFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\DecodeEncode; +namespace App\Core\ServiceFactory\DecodeEncode; use Chubbyphp\DecodeEncode\Encoder\JsonTypeEncoder; use Chubbyphp\DecodeEncode\Encoder\JsonxTypeEncoder; diff --git a/src/ServiceFactory/Framework/CallableResolverFactory.php b/src/Core/ServiceFactory/Framework/CallableResolverFactory.php similarity index 88% rename from src/ServiceFactory/Framework/CallableResolverFactory.php rename to src/Core/ServiceFactory/Framework/CallableResolverFactory.php index d3f3dee0..0741bda2 100644 --- a/src/ServiceFactory/Framework/CallableResolverFactory.php +++ b/src/Core/ServiceFactory/Framework/CallableResolverFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Framework; +namespace App\Core\ServiceFactory\Framework; use Psr\Container\ContainerInterface; use Slim\CallableResolver; diff --git a/src/ServiceFactory/Framework/InvocationStrategyFactory.php b/src/Core/ServiceFactory/Framework/InvocationStrategyFactory.php similarity index 86% rename from src/ServiceFactory/Framework/InvocationStrategyFactory.php rename to src/Core/ServiceFactory/Framework/InvocationStrategyFactory.php index 180d7ed2..38afcd99 100644 --- a/src/ServiceFactory/Framework/InvocationStrategyFactory.php +++ b/src/Core/ServiceFactory/Framework/InvocationStrategyFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Framework; +namespace App\Core\ServiceFactory\Framework; use Slim\Handlers\Strategies\RequestHandler; use Slim\Interfaces\InvocationStrategyInterface; diff --git a/src/ServiceFactory/Framework/RouteCollectorFactory.php b/src/Core/ServiceFactory/Framework/RouteCollectorFactory.php similarity index 96% rename from src/ServiceFactory/Framework/RouteCollectorFactory.php rename to src/Core/ServiceFactory/Framework/RouteCollectorFactory.php index 01dd8b0c..177e56b3 100644 --- a/src/ServiceFactory/Framework/RouteCollectorFactory.php +++ b/src/Core/ServiceFactory/Framework/RouteCollectorFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Framework; +namespace App\Core\ServiceFactory\Framework; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/ServiceFactory/Framework/RouteParserFactory.php b/src/Core/ServiceFactory/Framework/RouteParserFactory.php similarity index 91% rename from src/ServiceFactory/Framework/RouteParserFactory.php rename to src/Core/ServiceFactory/Framework/RouteParserFactory.php index f1232829..a87c8259 100644 --- a/src/ServiceFactory/Framework/RouteParserFactory.php +++ b/src/Core/ServiceFactory/Framework/RouteParserFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Framework; +namespace App\Core\ServiceFactory\Framework; use Psr\Container\ContainerInterface; use Slim\Interfaces\RouteCollectorInterface; diff --git a/src/ServiceFactory/Http/ResponseFactoryFactory.php b/src/Core/ServiceFactory/Http/ResponseFactoryFactory.php similarity index 84% rename from src/ServiceFactory/Http/ResponseFactoryFactory.php rename to src/Core/ServiceFactory/Http/ResponseFactoryFactory.php index 4740fdc4..af6b383c 100644 --- a/src/ServiceFactory/Http/ResponseFactoryFactory.php +++ b/src/Core/ServiceFactory/Http/ResponseFactoryFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Http; +namespace App\Core\ServiceFactory\Http; use Slim\Psr7\Factory\ResponseFactory; diff --git a/src/ServiceFactory/Http/StreamFactoryFactory.php b/src/Core/ServiceFactory/Http/StreamFactoryFactory.php similarity index 83% rename from src/ServiceFactory/Http/StreamFactoryFactory.php rename to src/Core/ServiceFactory/Http/StreamFactoryFactory.php index ab6c3194..8e749adb 100644 --- a/src/ServiceFactory/Http/StreamFactoryFactory.php +++ b/src/Core/ServiceFactory/Http/StreamFactoryFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Http; +namespace App\Core\ServiceFactory\Http; use Slim\Psr7\Factory\StreamFactory; diff --git a/src/ServiceFactory/Logger/LoggerFactory.php b/src/Core/ServiceFactory/Logger/LoggerFactory.php similarity index 95% rename from src/ServiceFactory/Logger/LoggerFactory.php rename to src/Core/ServiceFactory/Logger/LoggerFactory.php index aa5002db..a521deeb 100644 --- a/src/ServiceFactory/Logger/LoggerFactory.php +++ b/src/Core/ServiceFactory/Logger/LoggerFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Logger; +namespace App\Core\ServiceFactory\Logger; use Monolog\Formatter\LogstashFormatter; use Monolog\Handler\BufferHandler; diff --git a/src/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php b/src/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php similarity index 90% rename from src/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php rename to src/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php index 2c9d8d64..105cf993 100644 --- a/src/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php +++ b/src/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\Middleware; +namespace App\Core\ServiceFactory\Middleware; -use App\Middleware\ApiExceptionMiddleware; +use App\Core\Middleware\ApiExceptionMiddleware; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php b/src/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php similarity index 68% rename from src/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php rename to src/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php index 71670618..72bcdcbb 100644 --- a/src/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php +++ b/src/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\Middleware; +namespace App\Core\ServiceFactory\Middleware; -use App\Middleware\ConvertHttpExceptionMiddleware; +use App\Core\Middleware\ConvertHttpExceptionMiddleware; final class ConvertHttpExceptionMiddlewareFactory { diff --git a/src/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php b/src/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php similarity index 90% rename from src/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php rename to src/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php index 753ca376..496aa98b 100644 --- a/src/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php +++ b/src/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Negotiation; +namespace App\Core\ServiceFactory\Negotiation; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; diff --git a/src/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php b/src/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php similarity index 90% rename from src/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php rename to src/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php index e34b6e9b..1ec4e9db 100644 --- a/src/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php +++ b/src/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Negotiation; +namespace App\Core\ServiceFactory\Negotiation; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Psr\Container\ContainerInterface; diff --git a/src/ServiceFactory/Parsing/ParserFactory.php b/src/Core/ServiceFactory/Parsing/ParserFactory.php similarity index 83% rename from src/ServiceFactory/Parsing/ParserFactory.php rename to src/Core/ServiceFactory/Parsing/ParserFactory.php index 6c918d66..0c545b59 100644 --- a/src/ServiceFactory/Parsing/ParserFactory.php +++ b/src/Core/ServiceFactory/Parsing/ParserFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\ServiceFactory\Parsing; +namespace App\Core\ServiceFactory\Parsing; use Chubbyphp\Parsing\Parser; use Chubbyphp\Parsing\ParserInterface; diff --git a/src/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php b/src/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php similarity index 86% rename from src/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php rename to src/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php index 34f7f01b..1b60dbcb 100644 --- a/src/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php +++ b/src/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler; +namespace App\Core\ServiceFactory\RequestHandler; -use App\RequestHandler\OpenapiRequestHandler; +use App\Core\RequestHandler\OpenapiRequestHandler; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\StreamFactoryInterface; diff --git a/src/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php b/src/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php similarity index 82% rename from src/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php rename to src/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php index 1743ee34..9e37e6f9 100644 --- a/src/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php +++ b/src/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler; +namespace App\Core\ServiceFactory\RequestHandler; -use App\RequestHandler\PingRequestHandler; +use App\Core\RequestHandler\PingRequestHandler; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/Collection/PetCollection.php b/src/Pet/Collection/PetCollection.php similarity index 54% rename from src/Collection/PetCollection.php rename to src/Pet/Collection/PetCollection.php index d22ac426..6a79fa00 100644 --- a/src/Collection/PetCollection.php +++ b/src/Pet/Collection/PetCollection.php @@ -2,6 +2,8 @@ declare(strict_types=1); -namespace App\Collection; +namespace App\Pet\Collection; + +use App\Core\Collection\AbstractCollection; final class PetCollection extends AbstractCollection {} diff --git a/src/Dto/Collection/PetCollectionFilters.php b/src/Pet/Dto/Collection/PetCollectionFilters.php similarity index 76% rename from src/Dto/Collection/PetCollectionFilters.php rename to src/Pet/Dto/Collection/PetCollectionFilters.php index 0b120d2b..91a4c97a 100644 --- a/src/Dto/Collection/PetCollectionFilters.php +++ b/src/Pet/Dto/Collection/PetCollectionFilters.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Pet\Dto\Collection; + +use App\Core\Dto\Collection\CollectionFiltersInterface; final class PetCollectionFilters implements CollectionFiltersInterface { diff --git a/src/Dto/Collection/PetCollectionRequest.php b/src/Pet/Dto/Collection/PetCollectionRequest.php similarity index 77% rename from src/Dto/Collection/PetCollectionRequest.php rename to src/Pet/Dto/Collection/PetCollectionRequest.php index de408e7d..af20fb1c 100644 --- a/src/Dto/Collection/PetCollectionRequest.php +++ b/src/Pet/Dto/Collection/PetCollectionRequest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Pet\Dto\Collection; -use App\Collection\CollectionInterface; -use App\Collection\PetCollection; +use App\Core\Collection\CollectionInterface; +use App\Core\Dto\Collection\CollectionRequestInterface; +use App\Pet\Collection\PetCollection; final class PetCollectionRequest implements CollectionRequestInterface { diff --git a/src/Dto/Collection/PetCollectionResponse.php b/src/Pet/Dto/Collection/PetCollectionResponse.php similarity index 91% rename from src/Dto/Collection/PetCollectionResponse.php rename to src/Pet/Dto/Collection/PetCollectionResponse.php index de1cdfd3..9f142acc 100644 --- a/src/Dto/Collection/PetCollectionResponse.php +++ b/src/Pet/Dto/Collection/PetCollectionResponse.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Pet\Dto\Collection; -use App\Dto\Model\PetResponse; +use App\Core\Dto\Collection\AbstractCollectionResponse; +use App\Pet\Dto\Model\PetResponse; /** * @phpstan-type JsonSerializedResult array{ diff --git a/src/Dto/Collection/PetCollectionSort.php b/src/Pet/Dto/Collection/PetCollectionSort.php similarity index 76% rename from src/Dto/Collection/PetCollectionSort.php rename to src/Pet/Dto/Collection/PetCollectionSort.php index 418319d3..f37e3fb1 100644 --- a/src/Dto/Collection/PetCollectionSort.php +++ b/src/Pet/Dto/Collection/PetCollectionSort.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Collection; +namespace App\Pet\Dto\Collection; + +use App\Core\Dto\Collection\CollectionSortInterface; final class PetCollectionSort implements CollectionSortInterface { diff --git a/src/Dto/Model/PetRequest.php b/src/Pet/Dto/Model/PetRequest.php similarity index 88% rename from src/Dto/Model/PetRequest.php rename to src/Pet/Dto/Model/PetRequest.php index 7990cbe7..bf159f0b 100644 --- a/src/Dto/Model/PetRequest.php +++ b/src/Pet/Dto/Model/PetRequest.php @@ -2,11 +2,12 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Pet\Dto\Model; -use App\Model\ModelInterface; -use App\Model\Pet; -use App\Model\Vaccination; +use App\Core\Dto\Model\ModelRequestInterface; +use App\Core\Model\ModelInterface; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; final class PetRequest implements ModelRequestInterface { diff --git a/src/Dto/Model/PetResponse.php b/src/Pet/Dto/Model/PetResponse.php similarity index 95% rename from src/Dto/Model/PetResponse.php rename to src/Pet/Dto/Model/PetResponse.php index 3e87e48b..74072a4a 100644 --- a/src/Dto/Model/PetResponse.php +++ b/src/Pet/Dto/Model/PetResponse.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Pet\Dto\Model; + +use App\Core\Dto\Model\ModelResponseInterface; final class PetResponse implements ModelResponseInterface { diff --git a/src/Dto/Model/VaccinationRequest.php b/src/Pet/Dto/Model/VaccinationRequest.php similarity index 76% rename from src/Dto/Model/VaccinationRequest.php rename to src/Pet/Dto/Model/VaccinationRequest.php index 5e298f5c..aa749279 100644 --- a/src/Dto/Model/VaccinationRequest.php +++ b/src/Pet/Dto/Model/VaccinationRequest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Pet\Dto\Model; final class VaccinationRequest { diff --git a/src/Dto/Model/VaccinationResponse.php b/src/Pet/Dto/Model/VaccinationResponse.php similarity index 93% rename from src/Dto/Model/VaccinationResponse.php rename to src/Pet/Dto/Model/VaccinationResponse.php index 67e59531..92a7cf0c 100644 --- a/src/Dto/Model/VaccinationResponse.php +++ b/src/Pet/Dto/Model/VaccinationResponse.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Dto\Model; +namespace App\Pet\Dto\Model; final class VaccinationResponse implements \JsonSerializable { diff --git a/src/Model/Pet.php b/src/Pet/Model/Pet.php similarity index 97% rename from src/Model/Pet.php rename to src/Pet/Model/Pet.php index 3f2ef17c..12dfa944 100644 --- a/src/Model/Pet.php +++ b/src/Pet/Model/Pet.php @@ -2,8 +2,9 @@ declare(strict_types=1); -namespace App\Model; +namespace App\Pet\Model; +use App\Core\Model\ModelInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\Uuid; diff --git a/src/Model/Vaccination.php b/src/Pet/Model/Vaccination.php similarity index 97% rename from src/Model/Vaccination.php rename to src/Pet/Model/Vaccination.php index a90f50d8..75f4d955 100644 --- a/src/Model/Vaccination.php +++ b/src/Pet/Model/Vaccination.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Model; +namespace App\Pet\Model; use Ramsey\Uuid\Uuid; diff --git a/src/Orm/PetMapping.php b/src/Pet/Orm/PetMapping.php similarity index 94% rename from src/Orm/PetMapping.php rename to src/Pet/Orm/PetMapping.php index 1272a75d..6a89c56c 100644 --- a/src/Orm/PetMapping.php +++ b/src/Pet/Orm/PetMapping.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Orm; +namespace App\Pet\Orm; -use App\Model\Pet; -use App\Model\Vaccination; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; use Chubbyphp\Laminas\Config\Doctrine\Persistence\Mapping\Driver\ClassMapMappingInterface; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; diff --git a/src/Orm/VaccinationMapping.php b/src/Pet/Orm/VaccinationMapping.php similarity index 92% rename from src/Orm/VaccinationMapping.php rename to src/Pet/Orm/VaccinationMapping.php index f7a762c6..7bd00641 100644 --- a/src/Orm/VaccinationMapping.php +++ b/src/Pet/Orm/VaccinationMapping.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Orm; +namespace App\Pet\Orm; -use App\Model\Pet; -use App\Model\Vaccination; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; use Chubbyphp\Laminas\Config\Doctrine\Persistence\Mapping\Driver\ClassMapMappingInterface; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder; diff --git a/src/Parsing/PetParsing.php b/src/Pet/Parsing/PetParsing.php similarity index 93% rename from src/Parsing/PetParsing.php rename to src/Pet/Parsing/PetParsing.php index 31e32e75..6a494b5b 100644 --- a/src/Parsing/PetParsing.php +++ b/src/Pet/Parsing/PetParsing.php @@ -2,17 +2,18 @@ declare(strict_types=1); -namespace App\Parsing; - -use App\Collection\CollectionInterface; -use App\Dto\Collection\PetCollectionFilters; -use App\Dto\Collection\PetCollectionRequest; -use App\Dto\Collection\PetCollectionResponse; -use App\Dto\Collection\PetCollectionSort; -use App\Dto\Model\PetRequest; -use App\Dto\Model\PetResponse; -use App\Dto\Model\VaccinationRequest; -use App\Dto\Model\VaccinationResponse; +namespace App\Pet\Parsing; + +use App\Core\Collection\CollectionInterface; +use App\Core\Parsing\ParsingInterface; +use App\Pet\Dto\Collection\PetCollectionFilters; +use App\Pet\Dto\Collection\PetCollectionRequest; +use App\Pet\Dto\Collection\PetCollectionResponse; +use App\Pet\Dto\Collection\PetCollectionSort; +use App\Pet\Dto\Model\PetRequest; +use App\Pet\Dto\Model\PetResponse; +use App\Pet\Dto\Model\VaccinationRequest; +use App\Pet\Dto\Model\VaccinationResponse; use Chubbyphp\Parsing\ParserInterface; use Chubbyphp\Parsing\Schema\ObjectSchemaInterface; use Psr\Http\Message\ServerRequestInterface; diff --git a/src/Repository/PetRepository.php b/src/Pet/Repository/PetRepository.php similarity index 93% rename from src/Repository/PetRepository.php rename to src/Pet/Repository/PetRepository.php index b7979bcc..d8e136ec 100644 --- a/src/Repository/PetRepository.php +++ b/src/Pet/Repository/PetRepository.php @@ -2,12 +2,13 @@ declare(strict_types=1); -namespace App\Repository; +namespace App\Pet\Repository; -use App\Collection\CollectionInterface; -use App\Collection\PetCollection; -use App\Model\ModelInterface; -use App\Model\Pet; +use App\Core\Collection\CollectionInterface; +use App\Core\Model\ModelInterface; +use App\Core\Repository\RepositoryInterface; +use App\Pet\Collection\PetCollection; +use App\Pet\Model\Pet; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; diff --git a/src/ServiceFactory/Parsing/PetParsingFactory.php b/src/Pet/ServiceFactory/Parsing/PetParsingFactory.php similarity index 88% rename from src/ServiceFactory/Parsing/PetParsingFactory.php rename to src/Pet/ServiceFactory/Parsing/PetParsingFactory.php index 5b9e5e27..b7c86374 100644 --- a/src/ServiceFactory/Parsing/PetParsingFactory.php +++ b/src/Pet/ServiceFactory/Parsing/PetParsingFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\Parsing; +namespace App\Pet\ServiceFactory\Parsing; -use App\Parsing\PetParsing; +use App\Pet\Parsing\PetParsing; use Chubbyphp\Parsing\ParserInterface; use Psr\Container\ContainerInterface; use Slim\Interfaces\RouteParserInterface; diff --git a/src/ServiceFactory/Repository/PetRepositoryFactory.php b/src/Pet/ServiceFactory/Repository/PetRepositoryFactory.php similarity index 82% rename from src/ServiceFactory/Repository/PetRepositoryFactory.php rename to src/Pet/ServiceFactory/Repository/PetRepositoryFactory.php index c408cb7a..250c9773 100644 --- a/src/ServiceFactory/Repository/PetRepositoryFactory.php +++ b/src/Pet/ServiceFactory/Repository/PetRepositoryFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\ServiceFactory\Repository; +namespace App\Pet\ServiceFactory\Repository; -use App\Repository\PetRepository; +use App\Pet\Repository\PetRepository; use Doctrine\ORM\EntityManager; use Psr\Container\ContainerInterface; diff --git a/src/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php similarity index 85% rename from src/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php rename to src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php index e0ab4edf..c6b73a69 100644 --- a/src/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php +++ b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactory.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\CreateRequestHandler; +use App\Core\RequestHandler\Api\Crud\CreateRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; diff --git a/src/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php similarity index 78% rename from src/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php rename to src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php index 9bc9aebd..e77b9301 100644 --- a/src/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php +++ b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactory.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Core\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Pet\Repository\PetRepository; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php similarity index 82% rename from src/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php rename to src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php index 09f7190b..4cb56794 100644 --- a/src/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php +++ b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactory.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\ListRequestHandler; +use App\Core\RequestHandler\Api\Crud\ListRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php similarity index 82% rename from src/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php rename to src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php index 09d8f5ba..ea2ad13e 100644 --- a/src/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php +++ b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactory.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Core\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseFactoryInterface; diff --git a/src/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php similarity index 85% rename from src/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php rename to src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php index 4283a299..4757a9d2 100644 --- a/src/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php +++ b/src/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactory.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\RequestHandler\Api\Crud\UpdateRequestHandler; +use App\Core\RequestHandler\Api\Crud\UpdateRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Psr\Container\ContainerInterface; diff --git a/src/web.php b/src/web.php index 0a3c4feb..b3f9f5b2 100644 --- a/src/web.php +++ b/src/web.php @@ -4,16 +4,16 @@ namespace App; -use App\Middleware\ApiExceptionMiddleware; -use App\Middleware\ConvertHttpExceptionMiddleware; -use App\Model\Pet; -use App\RequestHandler\Api\Crud\CreateRequestHandler; -use App\RequestHandler\Api\Crud\DeleteRequestHandler; -use App\RequestHandler\Api\Crud\ListRequestHandler; -use App\RequestHandler\Api\Crud\ReadRequestHandler; -use App\RequestHandler\Api\Crud\UpdateRequestHandler; -use App\RequestHandler\OpenapiRequestHandler; -use App\RequestHandler\PingRequestHandler; +use App\Core\Middleware\ApiExceptionMiddleware; +use App\Core\Middleware\ConvertHttpExceptionMiddleware; +use App\Core\RequestHandler\Api\Crud\CreateRequestHandler; +use App\Core\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Core\RequestHandler\Api\Crud\ListRequestHandler; +use App\Core\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Core\RequestHandler\Api\Crud\UpdateRequestHandler; +use App\Core\RequestHandler\OpenapiRequestHandler; +use App\Core\RequestHandler\PingRequestHandler; +use App\Pet\Model\Pet; use Chubbyphp\Cors\CorsMiddleware; use Chubbyphp\Negotiation\Middleware\AcceptMiddleware; use Chubbyphp\Negotiation\Middleware\ContentTypeMiddleware; diff --git a/tests/Integration/CorsControllerTest.php b/tests/Integration/Core/CorsControllerTest.php similarity index 97% rename from tests/Integration/CorsControllerTest.php rename to tests/Integration/Core/CorsControllerTest.php index f1297be2..cdc1c6c8 100644 --- a/tests/Integration/CorsControllerTest.php +++ b/tests/Integration/Core/CorsControllerTest.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Integration; +namespace App\Tests\Integration\Core; + +use App\Tests\Integration\AbstractIntegrationTestCase; /** * @internal diff --git a/tests/Integration/OpenapiRequestHandlerTest.php b/tests/Integration/Core/OpenapiRequestHandlerTest.php similarity index 85% rename from tests/Integration/OpenapiRequestHandlerTest.php rename to tests/Integration/Core/OpenapiRequestHandlerTest.php index 028b0bd5..119e26cd 100644 --- a/tests/Integration/OpenapiRequestHandlerTest.php +++ b/tests/Integration/Core/OpenapiRequestHandlerTest.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Integration; +namespace App\Tests\Integration\Core; + +use App\Tests\Integration\AbstractIntegrationTestCase; /** * @internal diff --git a/tests/Integration/PingRequestHandlerTest.php b/tests/Integration/Core/PingRequestHandlerTest.php similarity index 92% rename from tests/Integration/PingRequestHandlerTest.php rename to tests/Integration/Core/PingRequestHandlerTest.php index 01f5257d..cc4d6460 100644 --- a/tests/Integration/PingRequestHandlerTest.php +++ b/tests/Integration/Core/PingRequestHandlerTest.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Integration; +namespace App\Tests\Integration\Core; + +use App\Tests\Integration\AbstractIntegrationTestCase; /** * @internal diff --git a/tests/Integration/PetCrudRequestHandlerTest.php b/tests/Integration/Pet/PetCrudRequestHandlerTest.php similarity index 99% rename from tests/Integration/PetCrudRequestHandlerTest.php rename to tests/Integration/Pet/PetCrudRequestHandlerTest.php index cb5af444..ed02d83e 100644 --- a/tests/Integration/PetCrudRequestHandlerTest.php +++ b/tests/Integration/Pet/PetCrudRequestHandlerTest.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Integration; +namespace App\Tests\Integration\Pet; + +use App\Tests\Integration\AbstractIntegrationTestCase; /** * @internal @@ -226,7 +228,8 @@ public function testList(): void self::assertTrue($found); - self::assertSame(['href' => '/api/pets?offset=0&limit=20&sort%5Bname%5D=desc', + self::assertSame([ + 'href' => '/api/pets?offset=0&limit=20&sort%5Bname%5D=desc', 'templated' => false, 'rel' => [], 'attributes' => [ diff --git a/tests/Unit/Collection/CollectionTest.php b/tests/Unit/Core/Collection/CollectionTest.php similarity index 91% rename from tests/Unit/Collection/CollectionTest.php rename to tests/Unit/Core/Collection/CollectionTest.php index df072ba9..8f21f913 100644 --- a/tests/Unit/Collection/CollectionTest.php +++ b/tests/Unit/Core/Collection/CollectionTest.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace App\Tests\Unit\Collection; +namespace App\Tests\Unit\Core\Collection; -use App\Collection\AbstractCollection; -use App\Collection\CollectionInterface; -use App\Model\ModelInterface; +use App\Core\Collection\AbstractCollection; +use App\Core\Collection\CollectionInterface; +use App\Core\Model\ModelInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; /** - * @covers \App\Collection\AbstractCollection + * @covers \App\Core\Collection\AbstractCollection * * @internal */ diff --git a/tests/Unit/Core/Dto/Collection/CollectionResponseTest.php b/tests/Unit/Core/Dto/Collection/CollectionResponseTest.php new file mode 100644 index 00000000..21b6ef64 --- /dev/null +++ b/tests/Unit/Core/Dto/Collection/CollectionResponseTest.php @@ -0,0 +1,87 @@ +create(ModelResponseInterface::class, [ + new WithReturn( + 'jsonSerialize', + [], + ['id' => '111d1691-8486-4447-997c-d10ce35d1fea'] + ), + ]); + + $collectionResponse = $this->getCollectionResponse(); + $collectionResponse->offset = 0; + $collectionResponse->limit = 20; + $collectionResponse->items = [$modelResponse]; + $collectionResponse->count = 1; + $collectionResponse->_links = []; + $collectionResponse->_type = 'unknown'; + + self::assertSame([ + 'offset' => 0, + 'limit' => 20, + 'filters' => [ + 'name' => 'John', + ], + 'sort' => [ + 'name' => 'asc', + ], + 'items' => [ + [ + 'id' => '111d1691-8486-4447-997c-d10ce35d1fea', + ], + ], + 'count' => 1, + '_type' => 'unknown', + '_links' => [], + ], $collectionResponse->jsonSerialize()); + } + + protected function getCollectionResponse(): AbstractCollectionResponse + { + return new class extends AbstractCollectionResponse { + protected function getFilters(): CollectionFiltersInterface + { + return new class implements CollectionFiltersInterface { + public function jsonSerialize(): array + { + return ['name' => 'John']; + } + }; + } + + protected function getSort(): CollectionSortInterface + { + return new class implements CollectionSortInterface { + public function jsonSerialize(): array + { + return ['name' => 'asc']; + } + }; + } + }; + } +} diff --git a/tests/Unit/Middleware/ApiExceptionMiddlewareTest.php b/tests/Unit/Core/Middleware/ApiExceptionMiddlewareTest.php similarity index 99% rename from tests/Unit/Middleware/ApiExceptionMiddlewareTest.php rename to tests/Unit/Core/Middleware/ApiExceptionMiddlewareTest.php index 02a2f5c7..275b185e 100644 --- a/tests/Unit/Middleware/ApiExceptionMiddlewareTest.php +++ b/tests/Unit/Core/Middleware/ApiExceptionMiddlewareTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\Middleware; +namespace App\Tests\Unit\Core\Middleware; -use App\Middleware\ApiExceptionMiddleware; +use App\Core\Middleware\ApiExceptionMiddleware; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpException; use Chubbyphp\Mock\MockMethod\WithCallback; @@ -22,7 +22,7 @@ use Psr\Log\LoggerInterface; /** - * @covers \App\Middleware\ApiExceptionMiddleware + * @covers \App\Core\Middleware\ApiExceptionMiddleware * * @internal */ diff --git a/tests/Unit/Middleware/ConvertHttpExceptionMiddlewareTest.php b/tests/Unit/Core/Middleware/ConvertHttpExceptionMiddlewareTest.php similarity index 93% rename from tests/Unit/Middleware/ConvertHttpExceptionMiddlewareTest.php rename to tests/Unit/Core/Middleware/ConvertHttpExceptionMiddlewareTest.php index bd835efd..434a2a60 100644 --- a/tests/Unit/Middleware/ConvertHttpExceptionMiddlewareTest.php +++ b/tests/Unit/Core/Middleware/ConvertHttpExceptionMiddlewareTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\Middleware; +namespace App\Tests\Unit\Core\Middleware; -use App\Middleware\ConvertHttpExceptionMiddleware; +use App\Core\Middleware\ConvertHttpExceptionMiddleware; use Chubbyphp\HttpException\HttpException as ChubbyphpHttpException; use Chubbyphp\Mock\MockMethod\WithException; use Chubbyphp\Mock\MockObjectBuilder; diff --git a/tests/Unit/RequestHandler/Api/Crud/CreateRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/Api/Crud/CreateRequestHandlerTest.php similarity index 94% rename from tests/Unit/RequestHandler/Api/Crud/CreateRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/Api/Crud/CreateRequestHandlerTest.php index 7666a3b3..2ad24a73 100644 --- a/tests/Unit/RequestHandler/Api/Crud/CreateRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/Api/Crud/CreateRequestHandlerTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler\Api\Crud; - -use App\Dto\Model\ModelRequestInterface; -use App\Dto\Model\ModelResponseInterface; -use App\Model\ModelInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\CreateRequestHandler; +namespace App\Tests\Unit\Core\RequestHandler\Api\Crud; + +use App\Core\Dto\Model\ModelRequestInterface; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Model\ModelInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\CreateRequestHandler; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpExceptionInterface; @@ -27,7 +27,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\Api\Crud\CreateRequestHandler + * @covers \App\Core\RequestHandler\Api\Crud\CreateRequestHandler * * @internal */ diff --git a/tests/Unit/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php similarity index 93% rename from tests/Unit/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php index 022460bc..6241d87d 100644 --- a/tests/Unit/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/Api/Crud/DeleteRequestHandlerTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler\Api\Crud; +namespace App\Tests\Unit\Core\RequestHandler\Api\Crud; -use App\Model\ModelInterface; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Core\Model\ModelInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\DeleteRequestHandler; use Chubbyphp\HttpException\HttpExceptionInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockMethod\WithReturnSelf; @@ -17,7 +17,7 @@ use Psr\Http\Message\ServerRequestInterface; /** - * @covers \App\RequestHandler\Api\Crud\DeleteRequestHandler + * @covers \App\Core\RequestHandler\Api\Crud\DeleteRequestHandler * * @internal */ diff --git a/tests/Unit/RequestHandler/Api/Crud/ListRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/Api/Crud/ListRequestHandlerTest.php similarity index 93% rename from tests/Unit/RequestHandler/Api/Crud/ListRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/Api/Crud/ListRequestHandlerTest.php index 743c9aac..b9e97df0 100644 --- a/tests/Unit/RequestHandler/Api/Crud/ListRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/Api/Crud/ListRequestHandlerTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler\Api\Crud; - -use App\Collection\CollectionInterface; -use App\Dto\Collection\CollectionRequestInterface; -use App\Dto\Collection\CollectionResponseInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\ListRequestHandler; +namespace App\Tests\Unit\Core\RequestHandler\Api\Crud; + +use App\Core\Collection\CollectionInterface; +use App\Core\Dto\Collection\CollectionRequestInterface; +use App\Core\Dto\Collection\CollectionResponseInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\ListRequestHandler; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpExceptionInterface; use Chubbyphp\Mock\MockMethod\WithException; @@ -27,7 +27,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\Api\Crud\ListRequestHandler + * @covers \App\Core\RequestHandler\Api\Crud\ListRequestHandler * * @internal */ diff --git a/tests/Unit/RequestHandler/Api/Crud/ReadRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/Api/Crud/ReadRequestHandlerTest.php similarity index 94% rename from tests/Unit/RequestHandler/Api/Crud/ReadRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/Api/Crud/ReadRequestHandlerTest.php index 1efdee3e..dee334cd 100644 --- a/tests/Unit/RequestHandler/Api/Crud/ReadRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/Api/Crud/ReadRequestHandlerTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler\Api\Crud; +namespace App\Tests\Unit\Core\RequestHandler\Api\Crud; -use App\Dto\Model\ModelResponseInterface; -use App\Model\ModelInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Model\ModelInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\ReadRequestHandler; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpExceptionInterface; use Chubbyphp\Mock\MockMethod\WithReturn; @@ -22,7 +22,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\Api\Crud\ReadRequestHandler + * @covers \App\Core\RequestHandler\Api\Crud\ReadRequestHandler * * @internal */ diff --git a/tests/Unit/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php similarity index 96% rename from tests/Unit/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php index 5a78c8f7..1a72a251 100644 --- a/tests/Unit/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/Api/Crud/UpdateRequestHandlerTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler\Api\Crud; - -use App\Dto\Model\ModelRequestInterface; -use App\Dto\Model\ModelResponseInterface; -use App\Model\ModelInterface; -use App\Parsing\ParsingInterface; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\UpdateRequestHandler; +namespace App\Tests\Unit\Core\RequestHandler\Api\Crud; + +use App\Core\Dto\Model\ModelRequestInterface; +use App\Core\Dto\Model\ModelResponseInterface; +use App\Core\Model\ModelInterface; +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\UpdateRequestHandler; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\HttpException\HttpExceptionInterface; @@ -27,7 +27,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\Api\Crud\UpdateRequestHandler + * @covers \App\Core\RequestHandler\Api\Crud\UpdateRequestHandler * * @internal */ diff --git a/tests/Unit/RequestHandler/OpenapiRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/OpenapiRequestHandlerTest.php similarity index 88% rename from tests/Unit/RequestHandler/OpenapiRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/OpenapiRequestHandlerTest.php index e90ed208..6306502d 100644 --- a/tests/Unit/RequestHandler/OpenapiRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/OpenapiRequestHandlerTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler; +namespace App\Tests\Unit\Core\RequestHandler; -use App\RequestHandler\OpenapiRequestHandler; +use App\Core\RequestHandler\OpenapiRequestHandler; use Chubbyphp\Mock\MockMethod\WithCallback; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockMethod\WithReturnSelf; @@ -17,7 +17,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\OpenapiRequestHandler + * @covers \App\Core\RequestHandler\OpenapiRequestHandler * * @internal */ @@ -52,7 +52,7 @@ public function testHandle(): void new WithCallback( 'createStreamFromFile', static function (string $filename, string $mode) use ($responseStream): StreamInterface { - self::assertMatchesRegularExpression('#src/RequestHandler/../../openapi\.yml$#', $filename); + self::assertMatchesRegularExpression('#src/Core/RequestHandler/../../../openapi\.yml$#', $filename); self::assertSame('r', $mode); return $responseStream; diff --git a/tests/Unit/RequestHandler/PingRequestHandlerTest.php b/tests/Unit/Core/RequestHandler/PingRequestHandlerTest.php similarity index 92% rename from tests/Unit/RequestHandler/PingRequestHandlerTest.php rename to tests/Unit/Core/RequestHandler/PingRequestHandlerTest.php index b1969ec4..5087f1d2 100644 --- a/tests/Unit/RequestHandler/PingRequestHandlerTest.php +++ b/tests/Unit/Core/RequestHandler/PingRequestHandlerTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\RequestHandler; +namespace App\Tests\Unit\Core\RequestHandler; -use App\RequestHandler\PingRequestHandler; +use App\Core\RequestHandler\PingRequestHandler; use Chubbyphp\Mock\MockMethod\WithCallback; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockMethod\WithReturnSelf; @@ -16,7 +16,7 @@ use Psr\Http\Message\StreamInterface; /** - * @covers \App\RequestHandler\PingRequestHandler + * @covers \App\Core\RequestHandler\PingRequestHandler * * @internal */ diff --git a/tests/Unit/ServiceFactory/Command/CommandsFactoryTest.php b/tests/Unit/Core/ServiceFactory/Command/CommandsFactoryTest.php similarity index 96% rename from tests/Unit/ServiceFactory/Command/CommandsFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Command/CommandsFactoryTest.php index 25cd63e5..b9db63a1 100644 --- a/tests/Unit/ServiceFactory/Command/CommandsFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Command/CommandsFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Command; +namespace App\Tests\Unit\Core\ServiceFactory\Command; -use App\ServiceFactory\Command\CommandsFactory; +use App\Core\ServiceFactory\Command\CommandsFactory; use Chubbyphp\CleanDirectories\Command\CleanDirectoriesCommand; use Chubbyphp\Laminas\Config\Doctrine\DBAL\Tools\Console\Command\Database\CreateCommand as DatabaseCreateCommand; use Chubbyphp\Laminas\Config\Doctrine\DBAL\Tools\Console\Command\Database\DropCommand as DatabaseDropCommand; @@ -31,7 +31,7 @@ use Psr\Container\ContainerInterface; /** - * @covers \App\ServiceFactory\Command\CommandsFactory + * @covers \App\Core\ServiceFactory\Command\CommandsFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php b/tests/Unit/Core/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php similarity index 85% rename from tests/Unit/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php rename to tests/Unit/Core/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php index d2b763f2..4fd9284c 100644 --- a/tests/Unit/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/DecodeEncode/TypeDecodersFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\DecodeEncode; +namespace App\Tests\Unit\Core\ServiceFactory\DecodeEncode; -use App\ServiceFactory\DecodeEncode\TypeDecodersFactory; +use App\Core\ServiceFactory\DecodeEncode\TypeDecodersFactory; use Chubbyphp\DecodeEncode\Decoder\JsonTypeDecoder; use Chubbyphp\DecodeEncode\Decoder\JsonxTypeDecoder; use Chubbyphp\DecodeEncode\Decoder\UrlEncodedTypeDecoder; @@ -12,7 +12,7 @@ use PHPUnit\Framework\TestCase; /** - * @covers \App\ServiceFactory\DecodeEncode\TypeDecodersFactory + * @covers \App\Core\ServiceFactory\DecodeEncode\TypeDecodersFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php b/tests/Unit/Core/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php similarity index 88% rename from tests/Unit/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php rename to tests/Unit/Core/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php index 7e1e44c0..df872871 100644 --- a/tests/Unit/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/DecodeEncode/TypeEncodersFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\DecodeEncode; +namespace App\Tests\Unit\Core\ServiceFactory\DecodeEncode; -use App\ServiceFactory\DecodeEncode\TypeEncodersFactory; +use App\Core\ServiceFactory\DecodeEncode\TypeEncodersFactory; use Chubbyphp\DecodeEncode\Encoder\JsonTypeEncoder; use Chubbyphp\DecodeEncode\Encoder\JsonxTypeEncoder; use Chubbyphp\DecodeEncode\Encoder\UrlEncodedTypeEncoder; @@ -15,7 +15,7 @@ use Psr\Container\ContainerInterface; /** - * @covers \App\ServiceFactory\DecodeEncode\TypeEncodersFactory + * @covers \App\Core\ServiceFactory\DecodeEncode\TypeEncodersFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Framework/CallableResolverFactoryTest.php b/tests/Unit/Core/ServiceFactory/Framework/CallableResolverFactoryTest.php similarity index 76% rename from tests/Unit/ServiceFactory/Framework/CallableResolverFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Framework/CallableResolverFactoryTest.php index b439ae99..3d798d92 100644 --- a/tests/Unit/ServiceFactory/Framework/CallableResolverFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Framework/CallableResolverFactoryTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Framework; +namespace App\Tests\Unit\Core\ServiceFactory\Framework; -use App\ServiceFactory\Framework\CallableResolverFactory; +use App\Core\ServiceFactory\Framework\CallableResolverFactory; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; use Slim\CallableResolver; /** - * @covers \App\ServiceFactory\Framework\CallableResolverFactory + * @covers \App\Core\ServiceFactory\Framework\CallableResolverFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Framework/InvocationStrategyFactoryTest.php b/tests/Unit/Core/ServiceFactory/Framework/InvocationStrategyFactoryTest.php similarity index 87% rename from tests/Unit/ServiceFactory/Framework/InvocationStrategyFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Framework/InvocationStrategyFactoryTest.php index 6fab9146..52d93fdc 100644 --- a/tests/Unit/ServiceFactory/Framework/InvocationStrategyFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Framework/InvocationStrategyFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Framework; +namespace App\Tests\Unit\Core\ServiceFactory\Framework; -use App\ServiceFactory\Framework\InvocationStrategyFactory; +use App\Core\ServiceFactory\Framework\InvocationStrategyFactory; use Chubbyphp\Mock\MockMethod\WithReturnSelf; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -13,7 +13,7 @@ use Slim\Interfaces\InvocationStrategyInterface; /** - * @covers \App\ServiceFactory\Framework\InvocationStrategyFactory + * @covers \App\Core\ServiceFactory\Framework\InvocationStrategyFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Framework/RouteCollectorFactoryTest.php b/tests/Unit/Core/ServiceFactory/Framework/RouteCollectorFactoryTest.php similarity index 90% rename from tests/Unit/ServiceFactory/Framework/RouteCollectorFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Framework/RouteCollectorFactoryTest.php index ab9d1816..ad501a01 100644 --- a/tests/Unit/ServiceFactory/Framework/RouteCollectorFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Framework/RouteCollectorFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Framework; +namespace App\Tests\Unit\Core\ServiceFactory\Framework; -use App\ServiceFactory\Framework\RouteCollectorFactory; +use App\Core\ServiceFactory\Framework\RouteCollectorFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -15,7 +15,7 @@ use Slim\Routing\RouteCollector; /** - * @covers \App\ServiceFactory\Framework\RouteCollectorFactory + * @covers \App\Core\ServiceFactory\Framework\RouteCollectorFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Framework/RouteParserFactoryTest.php b/tests/Unit/Core/ServiceFactory/Framework/RouteParserFactoryTest.php similarity index 86% rename from tests/Unit/ServiceFactory/Framework/RouteParserFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Framework/RouteParserFactoryTest.php index 062c1588..00c43ad4 100644 --- a/tests/Unit/ServiceFactory/Framework/RouteParserFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Framework/RouteParserFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Framework; +namespace App\Tests\Unit\Core\ServiceFactory\Framework; -use App\ServiceFactory\Framework\RouteParserFactory; +use App\Core\ServiceFactory\Framework\RouteParserFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -13,7 +13,7 @@ use Slim\Interfaces\RouteParserInterface; /** - * @covers \App\ServiceFactory\Framework\RouteParserFactory + * @covers \App\Core\ServiceFactory\Framework\RouteParserFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Http/ResponseFactoryFactoryTest.php b/tests/Unit/Core/ServiceFactory/Http/ResponseFactoryFactoryTest.php similarity index 77% rename from tests/Unit/ServiceFactory/Http/ResponseFactoryFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Http/ResponseFactoryFactoryTest.php index c40f1011..2454516e 100644 --- a/tests/Unit/ServiceFactory/Http/ResponseFactoryFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Http/ResponseFactoryFactoryTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Http; +namespace App\Tests\Unit\Core\ServiceFactory\Http; -use App\ServiceFactory\Http\ResponseFactoryFactory; +use App\Core\ServiceFactory\Http\ResponseFactoryFactory; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; use Slim\Psr7\Factory\ResponseFactory; /** - * @covers \App\ServiceFactory\Http\ResponseFactoryFactory + * @covers \App\Core\ServiceFactory\Http\ResponseFactoryFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Http/StreamFactoryFactoryTest.php b/tests/Unit/Core/ServiceFactory/Http/StreamFactoryFactoryTest.php similarity index 77% rename from tests/Unit/ServiceFactory/Http/StreamFactoryFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Http/StreamFactoryFactoryTest.php index fc576744..7555f569 100644 --- a/tests/Unit/ServiceFactory/Http/StreamFactoryFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Http/StreamFactoryFactoryTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Http; +namespace App\Tests\Unit\Core\ServiceFactory\Http; -use App\ServiceFactory\Http\StreamFactoryFactory; +use App\Core\ServiceFactory\Http\StreamFactoryFactory; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerInterface; use Slim\Psr7\Factory\StreamFactory; /** - * @covers \App\ServiceFactory\Http\StreamFactoryFactory + * @covers \App\Core\ServiceFactory\Http\StreamFactoryFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Logger/LoggerFactoryTest.php b/tests/Unit/Core/ServiceFactory/Logger/LoggerFactoryTest.php similarity index 93% rename from tests/Unit/ServiceFactory/Logger/LoggerFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Logger/LoggerFactoryTest.php index cafaa7f8..bcd27c6a 100644 --- a/tests/Unit/ServiceFactory/Logger/LoggerFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Logger/LoggerFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler; +namespace App\Tests\Unit\Core\ServiceFactory\Logger; -use App\ServiceFactory\Logger\LoggerFactory; +use App\Core\ServiceFactory\Logger\LoggerFactory; use App\Tests\Helper\AssertHelper; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -19,7 +19,7 @@ use Psr\Log\LoggerInterface; /** - * @covers \App\ServiceFactory\Logger\LoggerFactory + * @covers \App\Core\ServiceFactory\Logger\LoggerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php b/tests/Unit/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php similarity index 85% rename from tests/Unit/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php index 910097fd..bb449065 100644 --- a/tests/Unit/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Middleware/ApiExceptionMiddlewareFactoryTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Middleware; +namespace App\Tests\Unit\Core\ServiceFactory\Middleware; -use App\Middleware\ApiExceptionMiddleware; -use App\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory; +use App\Core\Middleware\ApiExceptionMiddleware; +use App\Core\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -15,7 +15,7 @@ use Psr\Log\LoggerInterface; /** - * @covers \App\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory + * @covers \App\Core\ServiceFactory\Middleware\ApiExceptionMiddlewareFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php b/tests/Unit/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php similarity index 56% rename from tests/Unit/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php index 991f2385..23822dcd 100644 --- a/tests/Unit/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Middleware/ConvertHttpExceptionMiddlewareFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Middleware; +namespace App\Tests\Unit\Core\ServiceFactory\Middleware; -use App\Middleware\ConvertHttpExceptionMiddleware; -use App\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory; +use App\Core\Middleware\ConvertHttpExceptionMiddleware; +use App\Core\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory; use PHPUnit\Framework\TestCase; /** - * @covers \App\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory + * @covers \App\Core\ServiceFactory\Middleware\ConvertHttpExceptionMiddlewareFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php b/tests/Unit/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php similarity index 81% rename from tests/Unit/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php index c7c7da88..ce21a7da 100644 --- a/tests/Unit/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Negotiation/AcceptNegotiatorSupportedMediaTypesFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Negotiation; +namespace App\Tests\Unit\Core\ServiceFactory\Negotiation; -use App\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory; +use App\Core\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -12,7 +12,7 @@ use Psr\Container\ContainerInterface; /** - * @covers \App\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory + * @covers \App\Core\ServiceFactory\Negotiation\AcceptNegotiatorSupportedMediaTypesFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php b/tests/Unit/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php similarity index 80% rename from tests/Unit/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php index 48994f2f..4e332fe1 100644 --- a/tests/Unit/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Negotiation/ContentTypeNegotiatorSupportedMediaTypesFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Negotiation; +namespace App\Tests\Unit\Core\ServiceFactory\Negotiation; -use App\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory; +use App\Core\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -12,7 +12,7 @@ use Psr\Container\ContainerInterface; /** - * @covers \App\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory + * @covers \App\Core\ServiceFactory\Negotiation\ContentTypeNegotiatorSupportedMediaTypesFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Parsing/ParserFactoryTest.php b/tests/Unit/Core/ServiceFactory/Parsing/ParserFactoryTest.php similarity index 67% rename from tests/Unit/ServiceFactory/Parsing/ParserFactoryTest.php rename to tests/Unit/Core/ServiceFactory/Parsing/ParserFactoryTest.php index 8d1d322c..11468eab 100644 --- a/tests/Unit/ServiceFactory/Parsing/ParserFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/Parsing/ParserFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Parsing; +namespace App\Tests\Unit\Core\ServiceFactory\Parsing; -use App\ServiceFactory\Parsing\ParserFactory; +use App\Core\ServiceFactory\Parsing\ParserFactory; use Chubbyphp\Parsing\ParserInterface; use PHPUnit\Framework\TestCase; /** - * @covers \App\ServiceFactory\Parsing\ParserFactory + * @covers \App\Core\ServiceFactory\Parsing\ParserFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php b/tests/Unit/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php similarity index 81% rename from tests/Unit/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php rename to tests/Unit/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php index 6d455c22..4c5ba058 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/RequestHandler/OpenapiRequestHandlerFactoryTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler; +namespace App\Tests\Unit\Core\ServiceFactory\RequestHandler; -use App\RequestHandler\OpenapiRequestHandler; -use App\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory; +use App\Core\RequestHandler\OpenapiRequestHandler; +use App\Core\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -14,7 +14,7 @@ use Psr\Http\Message\StreamFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory + * @covers \App\Core\ServiceFactory\RequestHandler\OpenapiRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php b/tests/Unit/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php similarity index 78% rename from tests/Unit/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php rename to tests/Unit/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php index ac0ccca6..85c43c71 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php +++ b/tests/Unit/Core/ServiceFactory/RequestHandler/PingRequestHandlerFactoryTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler; +namespace App\Tests\Unit\Core\ServiceFactory\RequestHandler; -use App\RequestHandler\PingRequestHandler; -use App\ServiceFactory\RequestHandler\PingRequestHandlerFactory; +use App\Core\RequestHandler\PingRequestHandler; +use App\Core\ServiceFactory\RequestHandler\PingRequestHandlerFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -13,7 +13,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\PingRequestHandlerFactory + * @covers \App\Core\ServiceFactory\RequestHandler\PingRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/Collection/PetCollectionTest.php b/tests/Unit/Pet/Collection/PetCollectionTest.php similarity index 50% rename from tests/Unit/Collection/PetCollectionTest.php rename to tests/Unit/Pet/Collection/PetCollectionTest.php index 1de9e187..4e2178f3 100644 --- a/tests/Unit/Collection/PetCollectionTest.php +++ b/tests/Unit/Pet/Collection/PetCollectionTest.php @@ -2,13 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\Collection; +namespace App\Tests\Unit\Pet\Collection; -use App\Collection\CollectionInterface; -use App\Collection\PetCollection; +use App\Core\Collection\CollectionInterface; +use App\Pet\Collection\PetCollection; +use App\Tests\Unit\Core\Collection\CollectionTest; /** - * @covers \App\Collection\PetCollection + * @covers \App\Pet\Collection\PetCollection * * @internal */ diff --git a/tests/Unit/Dto/Collection/PetCollectionRequestTest.php b/tests/Unit/Pet/Dto/Collection/PetCollectionRequestTest.php similarity index 74% rename from tests/Unit/Dto/Collection/PetCollectionRequestTest.php rename to tests/Unit/Pet/Dto/Collection/PetCollectionRequestTest.php index 3f48040a..096ae7de 100644 --- a/tests/Unit/Dto/Collection/PetCollectionRequestTest.php +++ b/tests/Unit/Pet/Dto/Collection/PetCollectionRequestTest.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace App\Tests\Unit\Dto\Collection; +namespace App\Tests\Unit\Pet\Dto\Collection; -use App\Collection\PetCollection; -use App\Dto\Collection\PetCollectionFilters; -use App\Dto\Collection\PetCollectionRequest; -use App\Dto\Collection\PetCollectionSort; +use App\Pet\Collection\PetCollection; +use App\Pet\Dto\Collection\PetCollectionFilters; +use App\Pet\Dto\Collection\PetCollectionRequest; +use App\Pet\Dto\Collection\PetCollectionSort; use PHPUnit\Framework\TestCase; /** - * @covers \App\Dto\Collection\PetCollectionFilters - * @covers \App\Dto\Collection\PetCollectionRequest - * @covers \App\Dto\Collection\PetCollectionSort + * @covers \App\Pet\Dto\Collection\PetCollectionFilters + * @covers \App\Pet\Dto\Collection\PetCollectionRequest + * @covers \App\Pet\Dto\Collection\PetCollectionSort * * @internal */ diff --git a/tests/Unit/Dto/Collection/PetCollectionResponseTest.php b/tests/Unit/Pet/Dto/Collection/PetCollectionResponseTest.php similarity index 85% rename from tests/Unit/Dto/Collection/PetCollectionResponseTest.php rename to tests/Unit/Pet/Dto/Collection/PetCollectionResponseTest.php index 54942295..95e79570 100644 --- a/tests/Unit/Dto/Collection/PetCollectionResponseTest.php +++ b/tests/Unit/Pet/Dto/Collection/PetCollectionResponseTest.php @@ -2,19 +2,19 @@ declare(strict_types=1); -namespace App\Tests\Unit\Dto\Collection; +namespace App\Tests\Unit\Pet\Dto\Collection; -use App\Dto\Collection\PetCollectionFilters; -use App\Dto\Collection\PetCollectionResponse; -use App\Dto\Collection\PetCollectionSort; -use App\Dto\Model\PetResponse; -use App\Dto\Model\VaccinationResponse; +use App\Pet\Dto\Collection\PetCollectionFilters; +use App\Pet\Dto\Collection\PetCollectionResponse; +use App\Pet\Dto\Collection\PetCollectionSort; +use App\Pet\Dto\Model\PetResponse; +use App\Pet\Dto\Model\VaccinationResponse; use PHPUnit\Framework\TestCase; /** - * @covers \App\Dto\Collection\PetCollectionFilters - * @covers \App\Dto\Collection\PetCollectionResponse - * @covers \App\Dto\Collection\PetCollectionSort + * @covers \App\Pet\Dto\Collection\PetCollectionFilters + * @covers \App\Pet\Dto\Collection\PetCollectionResponse + * @covers \App\Pet\Dto\Collection\PetCollectionSort * * @internal */ diff --git a/tests/Unit/Dto/Model/PetRequestTest.php b/tests/Unit/Pet/Dto/Model/PetRequestTest.php similarity index 91% rename from tests/Unit/Dto/Model/PetRequestTest.php rename to tests/Unit/Pet/Dto/Model/PetRequestTest.php index ae7a0389..4d487cea 100644 --- a/tests/Unit/Dto/Model/PetRequestTest.php +++ b/tests/Unit/Pet/Dto/Model/PetRequestTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Tests\Unit\Dto\Model; +namespace App\Tests\Unit\Pet\Dto\Model; -use App\Dto\Model\PetRequest; -use App\Dto\Model\VaccinationRequest; -use App\Model\Pet; +use App\Pet\Dto\Model\PetRequest; +use App\Pet\Dto\Model\VaccinationRequest; +use App\Pet\Model\Pet; use PHPUnit\Framework\TestCase; /** - * @covers \App\Dto\Model\PetRequest - * @covers \App\Dto\Model\VaccinationRequest + * @covers \App\Pet\Dto\Model\PetRequest + * @covers \App\Pet\Dto\Model\VaccinationRequest * * @internal */ diff --git a/tests/Unit/Dto/Model/PetResponseTest.php b/tests/Unit/Pet/Dto/Model/PetResponseTest.php similarity index 86% rename from tests/Unit/Dto/Model/PetResponseTest.php rename to tests/Unit/Pet/Dto/Model/PetResponseTest.php index 4e665423..c7f6d39b 100644 --- a/tests/Unit/Dto/Model/PetResponseTest.php +++ b/tests/Unit/Pet/Dto/Model/PetResponseTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Tests\Unit\Dto\Model; +namespace App\Tests\Unit\Pet\Dto\Model; -use App\Dto\Model\PetResponse; -use App\Dto\Model\VaccinationResponse; +use App\Pet\Dto\Model\PetResponse; +use App\Pet\Dto\Model\VaccinationResponse; use PHPUnit\Framework\TestCase; /** - * @covers \App\Dto\Model\PetResponse - * @covers \App\Dto\Model\VaccinationResponse + * @covers \App\Pet\Dto\Model\PetResponse + * @covers \App\Pet\Dto\Model\VaccinationResponse * * @internal */ diff --git a/tests/Unit/Model/PetTest.php b/tests/Unit/Pet/Model/PetTest.php similarity index 94% rename from tests/Unit/Model/PetTest.php rename to tests/Unit/Pet/Model/PetTest.php index 00a3dcaf..4fd778e2 100644 --- a/tests/Unit/Model/PetTest.php +++ b/tests/Unit/Pet/Model/PetTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Tests\Unit\Model; +namespace App\Tests\Unit\Pet\Model; -use App\Model\ModelInterface; -use App\Model\Pet; -use App\Model\Vaccination; +use App\Core\Model\ModelInterface; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; use PHPUnit\Framework\TestCase; /** - * @covers \App\Model\Pet + * @covers \App\Pet\Model\Pet * * @internal */ diff --git a/tests/Unit/Model/VaccinationTest.php b/tests/Unit/Pet/Model/VaccinationTest.php similarity index 85% rename from tests/Unit/Model/VaccinationTest.php rename to tests/Unit/Pet/Model/VaccinationTest.php index 47040b0e..df8f1442 100644 --- a/tests/Unit/Model/VaccinationTest.php +++ b/tests/Unit/Pet/Model/VaccinationTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\Model; +namespace App\Tests\Unit\Pet\Model; -use App\Model\Pet; -use App\Model\Vaccination; +use App\Pet\Model\Pet; +use App\Pet\Model\Vaccination; use PHPUnit\Framework\TestCase; /** - * @covers \App\Model\Vaccination + * @covers \App\Pet\Model\Vaccination * * @internal */ diff --git a/tests/Unit/Orm/PetMappingTest.php b/tests/Unit/Pet/Orm/PetMappingTest.php similarity index 93% rename from tests/Unit/Orm/PetMappingTest.php rename to tests/Unit/Pet/Orm/PetMappingTest.php index ab4930c6..b5f9cb2b 100644 --- a/tests/Unit/Orm/PetMappingTest.php +++ b/tests/Unit/Pet/Orm/PetMappingTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\Orm; +namespace App\Tests\Unit\Pet\Orm; -use App\Model\Vaccination; -use App\Orm\PetMapping; +use App\Pet\Model\Vaccination; +use App\Pet\Orm\PetMapping; use Chubbyphp\Mock\MockMethod\WithoutReturn; use Chubbyphp\Mock\MockObjectBuilder; use Doctrine\ORM\Mapping\ClassMetadata; @@ -13,7 +13,7 @@ use PHPUnit\Framework\TestCase; /** - * @covers \App\Orm\PetMapping + * @covers \App\Pet\Orm\PetMapping * * @internal */ diff --git a/tests/Unit/Orm/VaccinationMappingTest.php b/tests/Unit/Pet/Orm/VaccinationMappingTest.php similarity index 92% rename from tests/Unit/Orm/VaccinationMappingTest.php rename to tests/Unit/Pet/Orm/VaccinationMappingTest.php index 189b9e31..103221cf 100644 --- a/tests/Unit/Orm/VaccinationMappingTest.php +++ b/tests/Unit/Pet/Orm/VaccinationMappingTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\Orm; +namespace App\Tests\Unit\Pet\Orm; -use App\Model\Pet; -use App\Orm\VaccinationMapping; +use App\Pet\Model\Pet; +use App\Pet\Orm\VaccinationMapping; use Chubbyphp\Mock\MockMethod\WithoutReturn; use Chubbyphp\Mock\MockObjectBuilder; use Doctrine\ORM\Mapping\ClassMetadata; @@ -13,7 +13,7 @@ use PHPUnit\Framework\TestCase; /** - * @covers \App\Orm\VaccinationMapping + * @covers \App\Pet\Orm\VaccinationMapping * * @internal */ diff --git a/tests/Unit/Parsing/PetParsingTest.php b/tests/Unit/Pet/Parsing/PetParsingTest.php similarity index 98% rename from tests/Unit/Parsing/PetParsingTest.php rename to tests/Unit/Pet/Parsing/PetParsingTest.php index 6ac8f0ec..921f9e86 100644 --- a/tests/Unit/Parsing/PetParsingTest.php +++ b/tests/Unit/Pet/Parsing/PetParsingTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Unit\Parsing; +namespace App\Tests\Unit\Pet\Parsing; -use App\Dto\Collection\PetCollectionRequest; -use App\Dto\Collection\PetCollectionResponse; -use App\Dto\Model\PetRequest; -use App\Dto\Model\PetResponse; -use App\Parsing\PetParsing; +use App\Pet\Dto\Collection\PetCollectionRequest; +use App\Pet\Dto\Collection\PetCollectionResponse; +use App\Pet\Dto\Model\PetRequest; +use App\Pet\Dto\Model\PetResponse; +use App\Pet\Parsing\PetParsing; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use Chubbyphp\Parsing\ErrorsException; @@ -18,7 +18,7 @@ use Slim\Interfaces\RouteParserInterface; /** - * @covers \App\Parsing\PetParsing + * @covers \App\Pet\Parsing\PetParsing * * @internal */ diff --git a/tests/Unit/Repository/PetRepositoryTest.php b/tests/Unit/Pet/Repository/PetRepositoryTest.php similarity index 91% rename from tests/Unit/Repository/PetRepositoryTest.php rename to tests/Unit/Pet/Repository/PetRepositoryTest.php index 9991e66b..b2786543 100644 --- a/tests/Unit/Repository/PetRepositoryTest.php +++ b/tests/Unit/Pet/Repository/PetRepositoryTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Unit\Repository; +namespace App\Tests\Unit\Pet\Repository; -use App\Collection\CollectionInterface; -use App\Collection\PetCollection; -use App\Model\ModelInterface; -use App\Model\Pet; -use App\Repository\PetRepository; +use App\Core\Collection\CollectionInterface; +use App\Core\Model\ModelInterface; +use App\Pet\Collection\PetCollection; +use App\Pet\Model\Pet; +use App\Pet\Repository\PetRepository; use Chubbyphp\Mock\MockMethod\WithoutReturn; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockMethod\WithReturnSelf; @@ -25,7 +25,7 @@ use PHPUnit\Framework\TestCase; /** - * @covers \App\Repository\PetRepository + * @covers \App\Pet\Repository\PetRepository * * @internal */ @@ -43,8 +43,8 @@ public function testResolveCollectionWithWrongCollection(): void $this->expectException(\TypeError::class); $this->expectExceptionMessage( \sprintf( - 'App\Repository\PetRepository::resolveCollection() expects parameter 1 to be' - .' App\Collection\PetCollection, %s given', + 'App\Pet\Repository\PetRepository::resolveCollection() expects parameter 1 to be' + .' App\Pet\Collection\PetCollection, %s given', $collectionClass ) ); @@ -152,7 +152,7 @@ public function testPersistWithWrongModel(): void $this->expectException(\TypeError::class); $this->expectExceptionMessage( \sprintf( - 'App\Repository\PetRepository::persist() expects parameter 1 to be App\Model\Pet, %s given', + 'App\Pet\Repository\PetRepository::persist() expects parameter 1 to be App\Pet\Model\Pet, %s given', $modelClass ) ); @@ -192,7 +192,7 @@ public function testRemoveWithWrongModel(): void $this->expectException(\TypeError::class); $this->expectExceptionMessage( \sprintf( - 'App\Repository\PetRepository::remove() expects parameter 1 to be App\Model\Pet, %s given', + 'App\Pet\Repository\PetRepository::remove() expects parameter 1 to be App\Pet\Model\Pet, %s given', $modelClass ) ); diff --git a/tests/Unit/ServiceFactory/Parsing/PetParsingFactoryTest.php b/tests/Unit/Pet/ServiceFactory/Parsing/PetParsingFactoryTest.php similarity index 84% rename from tests/Unit/ServiceFactory/Parsing/PetParsingFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/Parsing/PetParsingFactoryTest.php index e7c620be..c6d77558 100644 --- a/tests/Unit/ServiceFactory/Parsing/PetParsingFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/Parsing/PetParsingFactoryTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Parsing; +namespace App\Tests\Unit\Pet\ServiceFactory\Parsing; -use App\Parsing\PetParsing; -use App\ServiceFactory\Parsing\PetParsingFactory; +use App\Pet\Parsing\PetParsing; +use App\Pet\ServiceFactory\Parsing\PetParsingFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use Chubbyphp\Parsing\ParserInterface; @@ -14,7 +14,7 @@ use Slim\Interfaces\RouteParserInterface; /** - * @covers \App\ServiceFactory\Parsing\PetParsingFactory + * @covers \App\Pet\ServiceFactory\Parsing\PetParsingFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/Repository/PetRepositoryFactoryTest.php b/tests/Unit/Pet/ServiceFactory/Repository/PetRepositoryFactoryTest.php similarity index 79% rename from tests/Unit/ServiceFactory/Repository/PetRepositoryFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/Repository/PetRepositoryFactoryTest.php index 4027a829..647e46bc 100644 --- a/tests/Unit/ServiceFactory/Repository/PetRepositoryFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/Repository/PetRepositoryFactoryTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\Repository; +namespace App\Tests\Unit\Pet\ServiceFactory\Repository; -use App\Repository\PetRepository; -use App\ServiceFactory\Repository\PetRepositoryFactory; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\Repository\PetRepositoryFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use Doctrine\ORM\EntityManager; @@ -13,7 +13,7 @@ use Psr\Container\ContainerInterface; /** - * @covers \App\ServiceFactory\Repository\PetRepositoryFactory + * @covers \App\Pet\ServiceFactory\Repository\PetRepositoryFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php similarity index 79% rename from tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php index 9dae7894..af77bbe3 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetCreateRequestHandlerFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler\Api\Crud; - -use App\Parsing\ParsingInterface; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\CreateRequestHandler; -use App\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory; +namespace App\Tests\Unit\Pet\ServiceFactory\RequestHandler\Api\Crud; + +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\CreateRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; @@ -19,7 +19,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory + * @covers \App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetCreateRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php similarity index 74% rename from tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php index 8df27fdb..b6df71c4 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetDeleteRequestHandlerFactoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler\Api\Crud; +namespace App\Tests\Unit\Pet\ServiceFactory\RequestHandler\Api\Crud; -use App\Repository\PetRepository; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\DeleteRequestHandler; -use App\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\DeleteRequestHandler; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; use PHPUnit\Framework\TestCase; @@ -15,7 +15,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory + * @covers \App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetDeleteRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php similarity index 77% rename from tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php index 587f3b42..ac2c819b 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetListRequestHandlerFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler\Api\Crud; - -use App\Parsing\ParsingInterface; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\ListRequestHandler; -use App\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory; +namespace App\Tests\Unit\Pet\ServiceFactory\RequestHandler\Api\Crud; + +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\ListRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -18,7 +18,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory + * @covers \App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetListRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php similarity index 77% rename from tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php index 3c6b276a..f75fba6c 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetReadRequestHandlerFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler\Api\Crud; - -use App\Parsing\ParsingInterface; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\ReadRequestHandler; -use App\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory; +namespace App\Tests\Unit\Pet\ServiceFactory\RequestHandler\Api\Crud; + +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\ReadRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; use Chubbyphp\Mock\MockObjectBuilder; @@ -18,7 +18,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory + * @covers \App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetReadRequestHandlerFactory * * @internal */ diff --git a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php similarity index 79% rename from tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php rename to tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php index d3c48bad..18cc4d1a 100644 --- a/tests/Unit/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php +++ b/tests/Unit/Pet/ServiceFactory/RequestHandler/Api/Crud/PetUpdateRequestHandlerFactoryTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Unit\ServiceFactory\RequestHandler\Api\Crud; - -use App\Parsing\ParsingInterface; -use App\Parsing\PetParsing; -use App\Repository\PetRepository; -use App\Repository\RepositoryInterface; -use App\RequestHandler\Api\Crud\UpdateRequestHandler; -use App\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory; +namespace App\Tests\Unit\Pet\ServiceFactory\RequestHandler\Api\Crud; + +use App\Core\Parsing\ParsingInterface; +use App\Core\Repository\RepositoryInterface; +use App\Core\RequestHandler\Api\Crud\UpdateRequestHandler; +use App\Pet\Parsing\PetParsing; +use App\Pet\Repository\PetRepository; +use App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory; use Chubbyphp\DecodeEncode\Decoder\DecoderInterface; use Chubbyphp\DecodeEncode\Encoder\EncoderInterface; use Chubbyphp\Mock\MockMethod\WithReturn; @@ -19,7 +19,7 @@ use Psr\Http\Message\ResponseFactoryInterface; /** - * @covers \App\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory + * @covers \App\Pet\ServiceFactory\RequestHandler\Api\Crud\PetUpdateRequestHandlerFactory * * @internal */