-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT Commits ------- 695c1a0 Add Event dispatcher provider 4bb7ff0 Flash helper with plural name 0322a5b Bulk update 8935446 Configure state machine resource metadata collection factory 75135eb Fix Psalm error 864dfe6 Remove processor on apply state machine transition 7a72f9e Fix coding standard 82e10a6 Fix flash helper unused code 2e34e82 Remove extra blank lines ec94944 Improve testing with multiple subscriptions af51e89 Fix PHPUnit tests
- Loading branch information
Showing
25 changed files
with
707 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/Bundle/test/templates/subscription/grid/bulk_action/accept.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| {% set path = options.link.url|default(path(options.link.route|default(grid.requestConfiguration.getRouteName('bulk_accept')), options.link.parameters|default({}))) %} | ||
|
|
||
| <form action="{{ path }}" method="post"> | ||
| <input type="hidden" name="_method" value="PATCH"> | ||
| <button type="submit"> | ||
| <i class="icon trash"></i> Bulk accept | ||
| </button> | ||
| <input type="hidden" name="_csrf_token" value="{{ csrf_token('bulk_accept') }}" /> | ||
|
|
||
| {% for resource in grid.data %} | ||
| <input type="hidden" name="ids[]" value="{{ resource.id }}" /> | ||
| {% endfor %} | ||
| </form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Sylius package. | ||
| * | ||
| * (c) Sylius Sp. z o.o. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Sylius\Component\Resource\Metadata; | ||
|
|
||
| /** | ||
| * @experimental | ||
| */ | ||
| #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)] | ||
| final class BulkUpdate extends HttpOperation implements UpdateOperationInterface, StateMachineAwareOperationInterface, BulkOperationInterface | ||
| { | ||
| public function __construct( | ||
| ?array $methods = null, | ||
| ?string $path = null, | ||
| ?string $routePrefix = null, | ||
| ?string $template = null, | ||
| ?string $shortName = null, | ||
| ?string $name = null, | ||
| string|callable|null $provider = null, | ||
| string|callable|null $processor = null, | ||
| string|callable|null $responder = null, | ||
| string|callable|null $repository = null, | ||
| ?string $repositoryMethod = null, | ||
| ?array $repositoryArguments = null, | ||
| ?string $grid = null, | ||
| ?bool $read = null, | ||
| ?bool $write = null, | ||
| ?bool $validate = null, | ||
| ?bool $deserialize = null, | ||
| ?bool $serialize = null, | ||
| ?string $formType = null, | ||
| ?array $formOptions = null, | ||
| ?array $validationContext = null, | ||
| ?string $eventShortName = null, | ||
| ?string $redirectToRoute = null, | ||
| ?array $redirectArguments = null, | ||
| private ?string $stateMachineComponent = null, | ||
| private ?string $stateMachineTransition = null, | ||
| private ?string $stateMachineGraph = null, | ||
| ) { | ||
| parent::__construct( | ||
| methods: $methods ?? ['PUT', 'PATCH'], | ||
| path: $path, | ||
| routePrefix: $routePrefix, | ||
| template: $template, | ||
| shortName: $shortName ?? 'bulk_update', | ||
| name: $name, | ||
| provider: $provider, | ||
| processor: $processor, | ||
| responder: $responder, | ||
| repository: $repository, | ||
| repositoryMethod: $repositoryMethod, | ||
| repositoryArguments: $repositoryArguments, | ||
| grid: $grid, | ||
| read: $read, | ||
| write: $write, | ||
| validate: $validate, | ||
| deserialize: $deserialize, | ||
| serialize: $serialize, | ||
| formType: $formType, | ||
| formOptions: $formOptions, | ||
| validationContext: $validationContext, | ||
| eventShortName: $eventShortName, | ||
| redirectToRoute: $redirectToRoute, | ||
| redirectArguments: $redirectArguments, | ||
| ); | ||
| } | ||
|
|
||
| public function getStateMachineComponent(): ?string | ||
| { | ||
| return $this->stateMachineComponent; | ||
| } | ||
|
|
||
| public function withStateMachineComponent(?string $stateMachineComponent): self | ||
| { | ||
| $self = clone $this; | ||
| $self->stateMachineComponent = $stateMachineComponent; | ||
|
|
||
| return $self; | ||
| } | ||
|
|
||
| public function getStateMachineTransition(): ?string | ||
| { | ||
| return $this->stateMachineTransition; | ||
| } | ||
|
|
||
| public function withStateMachineTransition(string $stateMachineTransition): self | ||
| { | ||
| $self = clone $this; | ||
| $self->stateMachineTransition = $stateMachineTransition; | ||
|
|
||
| return $self; | ||
| } | ||
|
|
||
| public function getStateMachineGraph(): ?string | ||
| { | ||
| return $this->stateMachineGraph; | ||
| } | ||
|
|
||
| public function withStateMachineGraph(string $stateMachineGraph): self | ||
| { | ||
| $self = clone $this; | ||
| $self->stateMachineGraph = $stateMachineGraph; | ||
|
|
||
| return $self; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/Component/Metadata/Resource/Factory/StateMachineResourceMetadataCollectionFactory.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Sylius package. | ||
| * | ||
| * (c) Sylius Sp. z o.o. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Sylius\Component\Resource\Metadata\Resource\Factory; | ||
|
|
||
| use Sylius\Component\Resource\Metadata\MetadataInterface; | ||
| use Sylius\Component\Resource\Metadata\Operation; | ||
| use Sylius\Component\Resource\Metadata\Operations; | ||
| use Sylius\Component\Resource\Metadata\RegistryInterface; | ||
| use Sylius\Component\Resource\Metadata\Resource as ResourceMetadata; | ||
| use Sylius\Component\Resource\Metadata\Resource\ResourceMetadataCollection; | ||
| use Sylius\Component\Resource\Metadata\StateMachineAwareOperationInterface; | ||
| use Sylius\Component\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor; | ||
|
|
||
| final class StateMachineResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface | ||
| { | ||
| public function __construct( | ||
| private RegistryInterface $resourceRegistry, | ||
| private ResourceMetadataCollectionFactoryInterface $decorated, | ||
| private ?string $defaultStateMachineComponent, | ||
| ) { | ||
| } | ||
|
|
||
| public function create(string $resourceClass): ResourceMetadataCollection | ||
| { | ||
| $resourceCollectionMetadata = $this->decorated->create($resourceClass); | ||
|
|
||
| /** @var ResourceMetadata $resource */ | ||
| foreach ($resourceCollectionMetadata->getIterator() as $i => $resource) { | ||
| $resourceConfiguration = $this->resourceRegistry->get($resource->getAlias() ?? ''); | ||
| $operations = $resource->getOperations() ?? new Operations(); | ||
|
|
||
| /** @var Operation $operation */ | ||
| foreach ($operations as $operation) { | ||
| /** @var string $key */ | ||
| $key = $operation->getName(); | ||
|
|
||
| $operations->add($key, $this->addDefaults($resourceConfiguration, $operation)); | ||
| } | ||
|
|
||
| $resource = $resource->withOperations($operations); | ||
|
|
||
| $resourceCollectionMetadata[$i] = $resource; | ||
| } | ||
|
|
||
| return $resourceCollectionMetadata; | ||
| } | ||
|
|
||
| private function addDefaults(MetadataInterface $resourceConfiguration, Operation $operation): Operation | ||
| { | ||
| if (!$operation instanceof StateMachineAwareOperationInterface) { | ||
| return $operation; | ||
| } | ||
|
|
||
| if ( | ||
| null === $operation->getStateMachineComponent() && | ||
| method_exists($resourceConfiguration, 'getStateMachineComponent') | ||
| ) { | ||
| $stateMachineComponent = $resourceConfiguration->getStateMachineComponent() ?? $this->defaultStateMachineComponent; | ||
|
|
||
| /** @var Operation $operation */ | ||
| $operation = $operation->withStateMachineComponent($stateMachineComponent); | ||
| } | ||
|
|
||
| if ( | ||
| method_exists($operation, 'getStateMachineTransition') && | ||
| null !== $operation->getStateMachineTransition() && | ||
| null === $operation->getProcessor() | ||
| ) { | ||
| $operation = $operation->withProcessor(ApplyStateMachineTransitionProcessor::class); | ||
| } | ||
|
|
||
| return $operation; | ||
| } | ||
| } |
Oops, something went wrong.