diff --git a/docs/processors.md b/docs/processors.md index 840ad63fb..dea227177 100644 --- a/docs/processors.md +++ b/docs/processors.md @@ -37,7 +37,7 @@ namespace App\Sylius\State\Processor; use Sylius\Component\Customer\Model\CustomerInterface; use Sylius\Resource\Doctrine\Common\State\PersistProcessor; -use Sylius\Component\Resource\State\ProcessorInterface; +use Sylius\Resource\State\ProcessorInterface; final class CreateCustomerProcessor implements ProcessorInterface { diff --git a/docs/providers.md b/docs/providers.md index d76fded76..0a7004d96 100644 --- a/docs/providers.md +++ b/docs/providers.md @@ -82,6 +82,8 @@ declare(strict_types=1); namespace App\BoardGameBlog\Infrastructure\Sylius\State\Provider; +use Sylius\Resource\State\ProviderInterface; + final class BoardGameItemProvider implements ProviderInterface { public function __construct( diff --git a/src/Bundle/DependencyInjection/SyliusResourceExtension.php b/src/Bundle/DependencyInjection/SyliusResourceExtension.php index 6a88fec8d..3d712880e 100644 --- a/src/Bundle/DependencyInjection/SyliusResourceExtension.php +++ b/src/Bundle/DependencyInjection/SyliusResourceExtension.php @@ -26,10 +26,10 @@ use Sylius\Component\Resource\Metadata\Metadata; use Sylius\Component\Resource\Metadata\ResourceMetadata; use Sylius\Component\Resource\Reflection\ClassReflection; -use Sylius\Component\Resource\State\ProcessorInterface; -use Sylius\Component\Resource\State\ProviderInterface; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Twig\Context\Factory\ContextFactoryInterface; +use Sylius\Resource\State\ProcessorInterface; +use Sylius\Resource\State\ProviderInterface; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/Bundle/Resources/config/services/state.xml b/src/Bundle/Resources/config/services/state.xml index ce9cc1703..aed49d4e8 100644 --- a/src/Bundle/Resources/config/services/state.xml +++ b/src/Bundle/Resources/config/services/state.xml @@ -23,7 +23,7 @@ @@ -31,13 +31,13 @@ - + - + @@ -45,19 +45,19 @@ - + - + - + - + @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@ @@ -83,10 +83,10 @@ - + - + diff --git a/src/Component/Grid/State/RequestGridProvider.php b/src/Component/Grid/State/RequestGridProvider.php index d746f3147..8c0d1502e 100644 --- a/src/Component/Grid/State/RequestGridProvider.php +++ b/src/Component/Grid/State/RequestGridProvider.php @@ -19,9 +19,9 @@ use Sylius\Component\Resource\Grid\View\Factory\GridViewFactoryInterface; use Sylius\Component\Resource\Metadata\GridAwareOperationInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ProviderInterface; final class RequestGridProvider implements ProviderInterface { diff --git a/src/Component/StateMachine/State/ApplyStateMachineTransitionProcessor.php b/src/Component/StateMachine/State/ApplyStateMachineTransitionProcessor.php index 7221516ff..f6c1ff40e 100644 --- a/src/Component/StateMachine/State/ApplyStateMachineTransitionProcessor.php +++ b/src/Component/StateMachine/State/ApplyStateMachineTransitionProcessor.php @@ -14,9 +14,9 @@ namespace Sylius\Component\Resource\StateMachine\State; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\StateMachine\OperationStateMachineInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; final class ApplyStateMachineTransitionProcessor implements ProcessorInterface { diff --git a/src/Component/Symfony/EventListener/FactoryListener.php b/src/Component/Symfony/EventListener/FactoryListener.php index 92a0c79af..a61549c97 100644 --- a/src/Component/Symfony/EventListener/FactoryListener.php +++ b/src/Component/Symfony/EventListener/FactoryListener.php @@ -16,8 +16,8 @@ use Sylius\Component\Resource\Metadata\FactoryAwareOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\FactoryInterface; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\FactoryInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; final class FactoryListener diff --git a/src/Component/Symfony/EventListener/ReadListener.php b/src/Component/Symfony/EventListener/ReadListener.php index 35c8cfb15..456112d26 100644 --- a/src/Component/Symfony/EventListener/ReadListener.php +++ b/src/Component/Symfony/EventListener/ReadListener.php @@ -15,8 +15,8 @@ use Sylius\Component\Resource\Metadata\CreateOperationInterface; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ProviderInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Component/Symfony/EventListener/RespondListener.php b/src/Component/Symfony/EventListener/RespondListener.php index 176fa6cde..c21445626 100644 --- a/src/Component/Symfony/EventListener/RespondListener.php +++ b/src/Component/Symfony/EventListener/RespondListener.php @@ -14,8 +14,8 @@ namespace Sylius\Component\Resource\Symfony\EventListener; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; use Webmozart\Assert\Assert; diff --git a/src/Component/Symfony/EventListener/WriteListener.php b/src/Component/Symfony/EventListener/WriteListener.php index 837ba99fa..60a3af3b9 100644 --- a/src/Component/Symfony/EventListener/WriteListener.php +++ b/src/Component/Symfony/EventListener/WriteListener.php @@ -14,8 +14,8 @@ namespace Sylius\Component\Resource\Symfony\EventListener; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ProcessorInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ViewEvent; diff --git a/src/Component/Symfony/Request/State/ApiResponder.php b/src/Component/Symfony/Request/State/ApiResponder.php index 117759442..f27cb71ff 100644 --- a/src/Component/Symfony/Request/State/ApiResponder.php +++ b/src/Component/Symfony/Request/State/ApiResponder.php @@ -17,10 +17,10 @@ use Sylius\Component\Resource\Metadata\DeleteOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Metadata\UpdateOperationInterface; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Symfony\Response\HeadersInitiatorInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\Response; use Webmozart\Assert\Assert; diff --git a/src/Component/Symfony/Request/State/Provider.php b/src/Component/Symfony/Request/State/Provider.php index 74d76b5f8..c0781f001 100644 --- a/src/Component/Symfony/Request/State/Provider.php +++ b/src/Component/Symfony/Request/State/Provider.php @@ -19,11 +19,11 @@ use Sylius\Component\Resource\Metadata\CollectionOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Reflection\CallableReflection; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface; use Sylius\Component\Resource\Symfony\Request\RepositoryArgumentResolver; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ProviderInterface; final class Provider implements ProviderInterface { diff --git a/src/Component/Symfony/Request/State/Responder.php b/src/Component/Symfony/Request/State/Responder.php index 8d2d1bdc0..21dab20a0 100644 --- a/src/Component/Symfony/Request/State/Responder.php +++ b/src/Component/Symfony/Request/State/Responder.php @@ -15,9 +15,9 @@ use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ResponderInterface; final class Responder implements ResponderInterface { diff --git a/src/Component/Symfony/Request/State/TwigResponder.php b/src/Component/Symfony/Request/State/TwigResponder.php index c4345a80c..91ca8ed3c 100644 --- a/src/Component/Symfony/Request/State/TwigResponder.php +++ b/src/Component/Symfony/Request/State/TwigResponder.php @@ -18,11 +18,11 @@ use Sylius\Component\Resource\Metadata\HttpOperation; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Metadata\UpdateOperationInterface; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Symfony\Routing\RedirectHandlerInterface; use Sylius\Component\Resource\Twig\Context\Factory\ContextFactoryInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\Response; use Twig\Environment; diff --git a/src/Component/spec/StateMachine/State/ApplyStateMachineTransitionProcessorSpec.php b/src/Component/spec/StateMachine/State/ApplyStateMachineTransitionProcessorSpec.php index ce1874b0c..cc9d07022 100644 --- a/src/Component/spec/StateMachine/State/ApplyStateMachineTransitionProcessorSpec.php +++ b/src/Component/spec/StateMachine/State/ApplyStateMachineTransitionProcessorSpec.php @@ -15,10 +15,10 @@ use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\StateMachine\OperationStateMachineInterface; use Sylius\Component\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; final class ApplyStateMachineTransitionProcessorSpec extends ObjectBehavior { diff --git a/src/Component/spec/Symfony/EventListener/FactoryListenerSpec.php b/src/Component/spec/Symfony/EventListener/FactoryListenerSpec.php index 78dac4098..8b809c94d 100644 --- a/src/Component/spec/Symfony/EventListener/FactoryListenerSpec.php +++ b/src/Component/spec/Symfony/EventListener/FactoryListenerSpec.php @@ -17,10 +17,10 @@ use Sylius\Component\Resource\Metadata\Create; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; use Sylius\Component\Resource\Metadata\Update; -use Sylius\Component\Resource\State\FactoryInterface; use Sylius\Component\Resource\Symfony\EventListener\FactoryListener; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\FactoryInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Component/spec/Symfony/EventListener/ReadListenerSpec.php b/src/Component/spec/Symfony/EventListener/ReadListenerSpec.php index 54550def4..0a47e2349 100644 --- a/src/Component/spec/Symfony/EventListener/ReadListenerSpec.php +++ b/src/Component/spec/Symfony/EventListener/ReadListenerSpec.php @@ -19,10 +19,10 @@ use Sylius\Component\Resource\Metadata\HttpOperation; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; use Sylius\Component\Resource\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Component\Resource\Symfony\EventListener\ReadListener; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ProviderInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/Component/spec/Symfony/EventListener/RespondListenerSpec.php b/src/Component/spec/Symfony/EventListener/RespondListenerSpec.php index d94dcbbeb..0bc4e9de1 100644 --- a/src/Component/spec/Symfony/EventListener/RespondListenerSpec.php +++ b/src/Component/spec/Symfony/EventListener/RespondListenerSpec.php @@ -16,10 +16,10 @@ use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\HttpOperation; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Symfony\EventListener\RespondListener; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Component/spec/Symfony/EventListener/WriteListenerSpec.php b/src/Component/spec/Symfony/EventListener/WriteListenerSpec.php index 8f77369db..a657757c0 100644 --- a/src/Component/spec/Symfony/EventListener/WriteListenerSpec.php +++ b/src/Component/spec/Symfony/EventListener/WriteListenerSpec.php @@ -17,10 +17,10 @@ use Prophecy\Argument; use Sylius\Component\Resource\Metadata\HttpOperation; use Sylius\Component\Resource\Metadata\Operation\HttpOperationInitiatorInterface; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\Symfony\EventListener\WriteListener; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Initiator\RequestContextInitiatorInterface; +use Sylius\Resource\State\ProcessorInterface; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Component/spec/Symfony/Request/State/ResponderSpec.php b/src/Component/spec/Symfony/Request/State/ResponderSpec.php index 0b3f9ff33..88f574378 100644 --- a/src/Component/spec/Symfony/Request/State/ResponderSpec.php +++ b/src/Component/spec/Symfony/Request/State/ResponderSpec.php @@ -16,10 +16,10 @@ use PhpSpec\ObjectBehavior; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\HttpOperation; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Symfony\Request\State\Responder; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Component/src/Doctrine/Common/State/PersistProcessor.php b/src/Component/src/Doctrine/Common/State/PersistProcessor.php index d0fa1f722..5c813b55f 100644 --- a/src/Component/src/Doctrine/Common/State/PersistProcessor.php +++ b/src/Component/src/Doctrine/Common/State/PersistProcessor.php @@ -19,8 +19,8 @@ use Doctrine\Persistence\ObjectManager as DoctrineObjectManager; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Reflection\ClassInfoTrait; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; final class PersistProcessor implements ProcessorInterface { diff --git a/src/Component/src/Doctrine/Common/State/RemoveProcessor.php b/src/Component/src/Doctrine/Common/State/RemoveProcessor.php index 15dfe15c6..e06dab9e1 100644 --- a/src/Component/src/Doctrine/Common/State/RemoveProcessor.php +++ b/src/Component/src/Doctrine/Common/State/RemoveProcessor.php @@ -17,8 +17,8 @@ use Doctrine\Persistence\ObjectManager as DoctrineObjectManager; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Reflection\ClassInfoTrait; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; final class RemoveProcessor implements ProcessorInterface { diff --git a/src/Component/State/Factory.php b/src/Component/src/State/Factory.php similarity index 98% rename from src/Component/State/Factory.php rename to src/Component/src/State/Factory.php index 71aaabd72..46726b5c7 100644 --- a/src/Component/State/Factory.php +++ b/src/Component/src/State/Factory.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Factory\FactoryInterface as ResourceFactoryInterface; diff --git a/src/Component/State/FactoryInterface.php b/src/Component/src/State/FactoryInterface.php similarity index 91% rename from src/Component/State/FactoryInterface.php rename to src/Component/src/State/FactoryInterface.php index f1efaa3b8..fec6d3792 100644 --- a/src/Component/State/FactoryInterface.php +++ b/src/Component/src/State/FactoryInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; diff --git a/src/Component/State/Processor.php b/src/Component/src/State/Processor.php similarity index 97% rename from src/Component/State/Processor.php rename to src/Component/src/State/Processor.php index 608fc4699..df5cb07b0 100644 --- a/src/Component/State/Processor.php +++ b/src/Component/src/State/Processor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Operation; diff --git a/src/Component/State/BulkAwareProcessor.php b/src/Component/src/State/Processor/BulkAwareProcessor.php similarity index 92% rename from src/Component/State/BulkAwareProcessor.php rename to src/Component/src/State/Processor/BulkAwareProcessor.php index 5e4360a01..602673be0 100644 --- a/src/Component/State/BulkAwareProcessor.php +++ b/src/Component/src/State/Processor/BulkAwareProcessor.php @@ -11,11 +11,12 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State\Processor; use Sylius\Component\Resource\Metadata\BulkOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; /** * @experimental diff --git a/src/Component/State/EventDispatcherBulkAwareProcessor.php b/src/Component/src/State/Processor/EventDispatcherBulkAwareProcessor.php similarity index 92% rename from src/Component/State/EventDispatcherBulkAwareProcessor.php rename to src/Component/src/State/Processor/EventDispatcherBulkAwareProcessor.php index 916c0d35f..875f2e783 100644 --- a/src/Component/State/EventDispatcherBulkAwareProcessor.php +++ b/src/Component/src/State/Processor/EventDispatcherBulkAwareProcessor.php @@ -11,12 +11,13 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State\Processor; use Sylius\Component\Resource\Metadata\BulkOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; /** * @experimental diff --git a/src/Component/State/EventDispatcherProcessor.php b/src/Component/src/State/Processor/EventDispatcherProcessor.php similarity index 95% rename from src/Component/State/EventDispatcherProcessor.php rename to src/Component/src/State/Processor/EventDispatcherProcessor.php index 004c2e566..4c8d855d5 100644 --- a/src/Component/State/EventDispatcherProcessor.php +++ b/src/Component/src/State/Processor/EventDispatcherProcessor.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State\Processor; use Sylius\Component\Resource\Metadata\CreateOperationInterface; use Sylius\Component\Resource\Metadata\Operation; @@ -19,6 +19,7 @@ use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventHandlerInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; /** * @experimental diff --git a/src/Component/State/ProcessorInterface.php b/src/Component/src/State/ProcessorInterface.php similarity index 93% rename from src/Component/State/ProcessorInterface.php rename to src/Component/src/State/ProcessorInterface.php index 7afd85108..3339e2794 100644 --- a/src/Component/State/ProcessorInterface.php +++ b/src/Component/src/State/ProcessorInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; diff --git a/src/Component/State/Provider.php b/src/Component/src/State/Provider.php similarity index 96% rename from src/Component/State/Provider.php rename to src/Component/src/State/Provider.php index e6f23c461..c6fffe73e 100644 --- a/src/Component/State/Provider.php +++ b/src/Component/src/State/Provider.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Operation; diff --git a/src/Component/State/EventDispatcherProvider.php b/src/Component/src/State/Provider/EventDispatcherProvider.php similarity index 93% rename from src/Component/State/EventDispatcherProvider.php rename to src/Component/src/State/Provider/EventDispatcherProvider.php index f0061fa12..b586e63ce 100644 --- a/src/Component/State/EventDispatcherProvider.php +++ b/src/Component/src/State/Provider/EventDispatcherProvider.php @@ -11,13 +11,14 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State\Provider; use Sylius\Component\Resource\Metadata\CollectionOperationInterface; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Component\Resource\Metadata\ShowOperationInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProviderInterface; /** * @experimental diff --git a/src/Component/State/ProviderInterface.php b/src/Component/src/State/ProviderInterface.php similarity index 92% rename from src/Component/State/ProviderInterface.php rename to src/Component/src/State/ProviderInterface.php index 7c8c60a53..b1fccddb6 100644 --- a/src/Component/State/ProviderInterface.php +++ b/src/Component/src/State/ProviderInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; diff --git a/src/Component/State/Responder.php b/src/Component/src/State/Responder.php similarity index 96% rename from src/Component/State/Responder.php rename to src/Component/src/State/Responder.php index e89bb93b9..73d1d7105 100644 --- a/src/Component/State/Responder.php +++ b/src/Component/src/State/Responder.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Operation; diff --git a/src/Component/State/ResponderInterface.php b/src/Component/src/State/ResponderInterface.php similarity index 92% rename from src/Component/State/ResponderInterface.php rename to src/Component/src/State/ResponderInterface.php index 2835ca201..f4a248203 100644 --- a/src/Component/State/ResponderInterface.php +++ b/src/Component/src/State/ResponderInterface.php @@ -11,7 +11,7 @@ declare(strict_types=1); -namespace Sylius\Component\Resource\State; +namespace Sylius\Resource\State; use Sylius\Component\Resource\Metadata\Operation; use Sylius\Resource\Context\Context; diff --git a/src/Component/spec/State/FactorySpec.php b/src/Component/tests/spec/State/FactorySpec.php similarity index 97% rename from src/Component/spec/State/FactorySpec.php rename to src/Component/tests/spec/State/FactorySpec.php index f5b0f6e3c..e6b4ab7cf 100644 --- a/src/Component/spec/State/FactorySpec.php +++ b/src/Component/tests/spec/State/FactorySpec.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State; use PhpSpec\ObjectBehavior; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Factory\FactoryInterface; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\Factory; use Sylius\Component\Resource\Symfony\ExpressionLanguage\ArgumentParserInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Factory; final class FactorySpec extends ObjectBehavior { diff --git a/src/Component/spec/State/BulkAwareProcessorSpec.php b/src/Component/tests/spec/State/Processor/BulkAwareProcessorSpec.php similarity index 92% rename from src/Component/spec/State/BulkAwareProcessorSpec.php rename to src/Component/tests/spec/State/Processor/BulkAwareProcessorSpec.php index c05fd0bcf..78bb92ed0 100644 --- a/src/Component/spec/State/BulkAwareProcessorSpec.php +++ b/src/Component/tests/spec/State/Processor/BulkAwareProcessorSpec.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State\Processor; use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\Api\Delete; use Sylius\Component\Resource\Metadata\BulkDelete; -use Sylius\Component\Resource\State\BulkAwareProcessor; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Processor\BulkAwareProcessor; +use Sylius\Resource\State\ProcessorInterface; final class BulkAwareProcessorSpec extends ObjectBehavior { diff --git a/src/Component/spec/State/EventDispatcherBulkAwareProcessorSpec.php b/src/Component/tests/spec/State/Processor/EventDispatcherBulkAwareProcessorSpec.php similarity index 90% rename from src/Component/spec/State/EventDispatcherBulkAwareProcessorSpec.php rename to src/Component/tests/spec/State/Processor/EventDispatcherBulkAwareProcessorSpec.php index fd82c223a..df85edbc2 100644 --- a/src/Component/spec/State/EventDispatcherBulkAwareProcessorSpec.php +++ b/src/Component/tests/spec/State/Processor/EventDispatcherBulkAwareProcessorSpec.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State\Processor; use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\BulkDelete; -use Sylius\Component\Resource\State\EventDispatcherBulkAwareProcessor; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEvent; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Component\Resource\Tests\Dummy\ProcessorWithCallable; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Processor\EventDispatcherBulkAwareProcessor; +use Sylius\Resource\State\ProcessorInterface; final class EventDispatcherBulkAwareProcessorSpec extends ObjectBehavior { diff --git a/src/Component/spec/State/EventDispatcherProcessorSpec.php b/src/Component/tests/spec/State/Processor/EventDispatcherProcessorSpec.php similarity index 96% rename from src/Component/spec/State/EventDispatcherProcessorSpec.php rename to src/Component/tests/spec/State/Processor/EventDispatcherProcessorSpec.php index e1ebf74af..8c0ff5ae5 100644 --- a/src/Component/spec/State/EventDispatcherProcessorSpec.php +++ b/src/Component/tests/spec/State/Processor/EventDispatcherProcessorSpec.php @@ -11,16 +11,16 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State\Processor; use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\EventDispatcherProcessor; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEvent; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventHandlerInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Processor\EventDispatcherProcessor; +use Sylius\Resource\State\ProcessorInterface; use Symfony\Component\HttpFoundation\Response; final class EventDispatcherProcessorSpec extends ObjectBehavior diff --git a/src/Component/spec/State/ProcessorSpec.php b/src/Component/tests/spec/State/ProcessorSpec.php similarity index 90% rename from src/Component/spec/State/ProcessorSpec.php rename to src/Component/tests/spec/State/ProcessorSpec.php index 9f99edd59..b5303bf2a 100644 --- a/src/Component/spec/State/ProcessorSpec.php +++ b/src/Component/tests/spec/State/ProcessorSpec.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State; use PhpSpec\ObjectBehavior; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\Processor; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Component\Resource\Tests\Dummy\ProcessorWithCallable; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Processor; +use Sylius\Resource\State\ProcessorInterface; final class ProcessorSpec extends ObjectBehavior { @@ -73,7 +73,7 @@ function it_throws_an_exception_when_configured_processor_is_not_a_processor_ins $locator->has('\stdClass')->willReturn(true); $locator->get('\stdClass')->willReturn(new \stdClass()); - $this->shouldThrow(new \InvalidArgumentException('Expected an instance of Sylius\Component\Resource\State\ProcessorInterface. Got: stdClass')) + $this->shouldThrow(new \InvalidArgumentException('Expected an instance of Sylius\Resource\State\ProcessorInterface. Got: stdClass')) ->during('process', [[], $operation, $context]) ; } diff --git a/src/Component/spec/State/EventDispatcherProviderSpec.php b/src/Component/tests/spec/State/Provider/EventDispatcherProviderSpec.php similarity index 94% rename from src/Component/spec/State/EventDispatcherProviderSpec.php rename to src/Component/tests/spec/State/Provider/EventDispatcherProviderSpec.php index 5c38c5eca..c1067004a 100644 --- a/src/Component/spec/State/EventDispatcherProviderSpec.php +++ b/src/Component/tests/spec/State/Provider/EventDispatcherProviderSpec.php @@ -11,17 +11,17 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State\Provider; use PhpSpec\ObjectBehavior; use Sylius\Component\Resource\Metadata\Create; use Sylius\Component\Resource\Metadata\Index; use Sylius\Component\Resource\Metadata\Show; -use Sylius\Component\Resource\State\EventDispatcherProvider; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEvent; use Sylius\Component\Resource\Symfony\EventDispatcher\OperationEventDispatcherInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Provider\EventDispatcherProvider; +use Sylius\Resource\State\ProviderInterface; final class EventDispatcherProviderSpec extends ObjectBehavior { diff --git a/src/Component/spec/State/ProviderSpec.php b/src/Component/tests/spec/State/ProviderSpec.php similarity index 90% rename from src/Component/spec/State/ProviderSpec.php rename to src/Component/tests/spec/State/ProviderSpec.php index d223ccacd..3d85f30e9 100644 --- a/src/Component/spec/State/ProviderSpec.php +++ b/src/Component/tests/spec/State/ProviderSpec.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State; use PhpSpec\ObjectBehavior; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\Provider; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Component\Resource\Tests\Dummy\ProviderWithCallable; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Provider; +use Sylius\Resource\State\ProviderInterface; final class ProviderSpec extends ObjectBehavior { @@ -73,7 +73,7 @@ function it_throws_an_exception_when_configured_provider_is_not_a_provider_insta $locator->has('\stdClass')->willReturn(true); $locator->get('\stdClass')->willReturn(new \stdClass()); - $this->shouldThrow(new \InvalidArgumentException('Expected an instance of Sylius\Component\Resource\State\ProviderInterface. Got: stdClass')) + $this->shouldThrow(new \InvalidArgumentException('Expected an instance of Sylius\Resource\State\ProviderInterface. Got: stdClass')) ->during('provide', [$operation, $context]) ; } diff --git a/src/Component/spec/State/ResponderSpec.php b/src/Component/tests/spec/State/ResponderSpec.php similarity index 72% rename from src/Component/spec/State/ResponderSpec.php rename to src/Component/tests/spec/State/ResponderSpec.php index f707b5332..c157511da 100644 --- a/src/Component/spec/State/ResponderSpec.php +++ b/src/Component/tests/spec/State/ResponderSpec.php @@ -11,15 +11,15 @@ declare(strict_types=1); -namespace spec\Sylius\Component\Resource\State; +namespace spec\Sylius\Resource\State; use PhpSpec\ObjectBehavior; use Psr\Container\ContainerInterface; use Sylius\Component\Resource\Metadata\Create; -use Sylius\Component\Resource\State\Responder; -use Sylius\Component\Resource\State\ResponderInterface; use Sylius\Component\Resource\Tests\Dummy\ResponderWithCallable; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\Responder; +use Sylius\Resource\State\ResponderInterface; use Symfony\Component\HttpFoundation\Response; final class ResponderSpec extends ObjectBehavior @@ -64,4 +64,18 @@ function it_returns_null_if_operation_has_no_responder(): void $this->respond([], $operation, $context)->shouldReturn(null); } + + function it_throws_an_exception_when_configured_responder_is_not_a_responder_instance( + ContainerInterface $locator, + ): void { + $operation = new Create(responder: '\stdClass'); + $context = new Context(); + + $locator->has('\stdClass')->willReturn(true); + $locator->get('\stdClass')->willReturn(new \stdClass()); + + $this->shouldThrow(new \InvalidArgumentException('Expected an instance of Sylius\Resource\State\ResponderInterface. Got: stdClass')) + ->during('respond', [[], $operation, $context]) + ; + } } diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/CreateBoardGameProcessor.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/CreateBoardGameProcessor.php index e864d68f9..f97abe454 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/CreateBoardGameProcessor.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/CreateBoardGameProcessor.php @@ -19,8 +19,8 @@ use App\BoardGameBlog\Infrastructure\Sylius\Resource\BoardGameResource; use App\Shared\Application\Command\CommandBusInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; use Webmozart\Assert\Assert; final class CreateBoardGameProcessor implements ProcessorInterface diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/DeleteBoardGameProcessor.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/DeleteBoardGameProcessor.php index 37aa119d9..5a47bb00b 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/DeleteBoardGameProcessor.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/DeleteBoardGameProcessor.php @@ -18,8 +18,8 @@ use App\BoardGameBlog\Infrastructure\Sylius\Resource\BoardGameResource; use App\Shared\Application\Command\CommandBusInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; use Webmozart\Assert\Assert; final class DeleteBoardGameProcessor implements ProcessorInterface diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/UpdateBoardGameProcessor.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/UpdateBoardGameProcessor.php index f1ed1677a..e6b6ea030 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/UpdateBoardGameProcessor.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Processor/UpdateBoardGameProcessor.php @@ -19,8 +19,8 @@ use App\BoardGameBlog\Infrastructure\Sylius\Resource\BoardGameResource; use App\Shared\Application\Command\CommandBusInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProcessorInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProcessorInterface; use Webmozart\Assert\Assert; final class UpdateBoardGameProcessor implements ProcessorInterface diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php index 71106a349..020d7b3fb 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameCollectionProvider.php @@ -15,8 +15,8 @@ use Sylius\Component\Resource\Grid\State\RequestGridProvider; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Resource\Context\Context; +use Sylius\Resource\State\ProviderInterface; final class BoardGameCollectionProvider implements ProviderInterface { diff --git a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameItemProvider.php b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameItemProvider.php index 3e31a19ca..8b51ff13d 100644 --- a/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameItemProvider.php +++ b/tests/Application/src/BoardGameBlog/Infrastructure/Sylius/State/Http/Provider/BoardGameItemProvider.php @@ -18,9 +18,9 @@ use App\BoardGameBlog\Infrastructure\Sylius\Resource\BoardGameResource; use App\Shared\Application\Query\QueryBusInterface; use Sylius\Component\Resource\Metadata\Operation; -use Sylius\Component\Resource\State\ProviderInterface; use Sylius\Resource\Context\Context; use Sylius\Resource\Context\Option\RequestOption; +use Sylius\Resource\State\ProviderInterface; use Symfony\Component\Uid\Uuid; use Webmozart\Assert\Assert;