feat(php-grids): Use new with actions' helpers

2026-07-05 20:57:12 +00:00 · 2026-07-02 09:29:58 +02:00 · 2026-07-02 09:29:58 +02:00 · df658cdcc5
commit df658cdcc5
parent 2b90aa9a44
32 changed files with 501 additions and 710 deletions
--- a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
@ -80,21 +77,16 @@ final class AdminUserGrid implements AdminUserGridInterface
                BooleanFilter::create('enabled')
                    ->setLabel('sylius.ui.enabled'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php
@ -17,8 +17,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\ShowAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter;
@ -136,37 +134,33 @@ final class CatalogPromotionGrid implements CatalogPromotionGridInterface
                    ]),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    ShowAction::create(),
-                    Action::create('show_variants', 'show')
-                        ->setLabel('sylius.ui.list_variants')
-                        ->setIcon('tabler:list-letters')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_catalog_promotion_product_variant_index',
-                                'parameters' => [
-                                    'id' => 'resource.id',
-                                ],
+            ->withItemActions(
+                ShowAction::create(),
+                Action::create('show_variants', 'show')
+                    ->setLabel('sylius.ui.list_variants')
+                    ->setIcon('tabler:list-letters')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_catalog_promotion_product_variant_index',
+                            'parameters' => [
+                                'id' => 'resource.id',
                            ],
-                        ]),
-                    UpdateAction::create(),
-                    Action::create('delete', 'delete_catalog_promotion')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_catalog_promotion_delete',
-                                'parameters' => [
-                                    'code' => 'resource.code',
-                                ],
+                        ],
+                    ]),
+                UpdateAction::create(),
+                Action::create('delete', 'delete_catalog_promotion')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_catalog_promotion_delete',
+                            'parameters' => [
+                                'code' => 'resource.code',
                            ],
-                            'state' => 'resource.state',
-                        ]),
-                ),
+                        ],
+                        'state' => 'resource.state',
+                    ]),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
@ -65,21 +62,16 @@ final class ChannelGrid implements ChannelGridInterface
                BooleanFilter::create('enabled')
                    ->setLabel('sylius.ui.enabled'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php
@ -15,8 +15,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -62,15 +60,11 @@ final class CountryGrid implements CountryGridInterface
                    ->setLabel('sylius.ui.enabled'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php
@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
@ -51,10 +50,8 @@ final class CurrencyGrid implements CurrencyGridInterface
                StringFilter::create('code')
                    ->setLabel('sylius.ui.code'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
        ;
    }
--- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php
@ -17,8 +17,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\ShowAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -92,14 +90,11 @@ final class CustomerGrid implements CustomerGridInterface
                    'fields' => ['group.id'],
                ]),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('show_orders', 'show')
+            ->withItemActions(
+                Action::create('show_orders', 'show')
                    ->setLabel('sylius.ui.show_orders')
                    ->setIcon('tabler:shopping-bag')
                    ->setOptions([
@ -108,9 +103,8 @@ final class CustomerGrid implements CustomerGridInterface
                            'parameters' => ['id' => 'resource.id'],
                        ],
                    ]),
-                    ShowAction::create(),
-                    UpdateAction::create(),
-                ),
+                ShowAction::create(),
+                UpdateAction::create(),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -60,21 +57,16 @@ final class CustomerGroupGrid implements CustomerGroupGridInterface
                StringFilter::create('search', ['code', 'name'])
                    ->setLabel('sylius.ui.search'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -62,21 +59,15 @@ final class ExchangeRateGrid implements ExchangeRateGridInterface
                    ->addFormOption('choice_label', 'name'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
+            ->withBulkActions(
+                DeleteAction::create(),
            )
        ;
    }
--- a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php
@ -15,7 +15,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -86,27 +85,25 @@ final class InventoryGrid implements InventoryGridInterface
                        'fields' => ['product.id'],
                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('update_product', 'update')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_update',
-                                'parameters' => [
-                                    'id' => 'resource.product.id',
-                                ],
-                            ],
-                        ])
-                        ->setLabel('sylius.ui.edit_product'),
-                    UpdateAction::create([
+            ->withItemActions(
+                Action::create('update_product', 'update')
+                    ->setOptions([
                        'link' => [
+                            'route' => 'sylius_admin_product_update',
                            'parameters' => [
-                                'id' => 'resource.id',
-                                'productId' => 'resource.product.id',
+                                'id' => 'resource.product.id',
                            ],
                        ],
-                    ]),
-                ),
+                    ])
+                    ->setLabel('sylius.ui.edit_product'),
+                UpdateAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'productId' => 'resource.product.id',
+                        ],
+                    ],
+                ]),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php
@ -15,8 +15,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -48,15 +46,11 @@ final class LocaleGrid implements LocaleGridInterface
                Filter::create('code', 'string')
                    ->setLabel('sylius.ui.code'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                DeleteAction::create(),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php
@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\ShowAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -174,10 +173,8 @@ final class OrderGrid implements OrderGridInterface
                        ],
                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    ShowAction::create(),
-                ),
+            ->withItemActions(
+                ShowAction::create(),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php
@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -97,34 +96,32 @@ final class PaymentGrid implements PaymentGridInterface
                        'class' => $this->channelClass,
                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('list_payment_requests', 'show')
-                        ->setIcon('tabler:list-letters')
-                        ->setLabel('sylius.ui.list_payment_requests')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_payment_request_index',
-                                'parameters' => [
-                                    'paymentId' => 'resource.id',
-                                ],
+            ->withItemActions(
+                Action::create('list_payment_requests', 'show')
+                    ->setIcon('tabler:list-letters')
+                    ->setLabel('sylius.ui.list_payment_requests')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_payment_request_index',
+                            'parameters' => [
+                                'paymentId' => 'resource.id',
                            ],
-                        ]),
-                    Action::create('complete', 'apply_transition')
-                        ->setLabel('sylius.ui.complete')
-                        ->setIcon('tabler:credit-card-pay')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_payment_complete',
-                                'parameters' => [
-                                    'id' => 'resource.id',
-                                ],
+                        ],
+                    ]),
+                Action::create('complete', 'apply_transition')
+                    ->setLabel('sylius.ui.complete')
+                    ->setIcon('tabler:credit-card-pay')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_payment_complete',
+                            'parameters' => [
+                                'id' => 'resource.id',
                            ],
-                            'class' => 'teal',
-                            'transition' => 'complete',
-                            'graph' => 'sylius_payment',
-                        ]),
-                ),
+                        ],
+                        'class' => 'teal',
+                        'transition' => 'complete',
+                        'graph' => 'sylius_payment',
+                    ]),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
@ -81,21 +78,16 @@ final class PaymentMethodGrid implements PaymentMethodGridInterface
                    ->setLabel('sylius.ui.enabled'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('create', 'create_payment_method'),
-                ),
+            ->withMainActions(
+                Action::create('create', 'create_payment_method'),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php
@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\ShowAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -103,20 +102,17 @@ final class PaymentRequestGrid implements PaymentRequestGridInterface
                    ->setLabel('sylius.ui.state'),
            )

-            ->addActionGroup(
-                ItemActionGroup::create(
-                    ShowAction::create()
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_payment_request_show',
-                                'parameters' => [
-                                    'hash' => 'resource.hash',
-                                    'paymentId' => 'resource.payment.id',
-                                ],
+            ->withItemActions(
+                ShowAction::create()
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_payment_request_show',
+                            'parameters' => [
+                                'hash' => 'resource.hash',
+                                'paymentId' => 'resource.payment.id',
                            ],
-                        ]),
-                ),
-            )
-        ;
+                        ],
+                    ]),
+            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -70,21 +67,16 @@ final class ProductAssociationTypeGrid implements ProductAssociationTypeGridInte
                        ],
                    ]),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
@ -108,21 +105,16 @@ final class ProductAttributeGrid implements ProductAttributeGridInterface
                    ->setLabel('sylius.ui.translatable'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('create', 'create_product_attribute'),
-                ),
+            ->withMainActions(
+                Action::create('create', 'create_product_attribute'),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php
@ -16,10 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\SubItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
@ -105,8 +101,8 @@ final class ProductGrid implements ProductGridInterface
                    ->addOption('fields', ['mainTaxon.id']),
            )

-            ->addActionGroup(
-                MainActionGroup::create(Action::create('create', 'links')
+            ->withMainActions(
+                Action::create('create', 'links')
                    ->setLabel('sylius.ui.create')
                    ->setOptions([
                        'class' => 'primary',
@ -125,53 +121,48 @@ final class ProductGrid implements ProductGridInterface
                                'route' => 'sylius_admin_product_create',
                            ],
                        ],
-                    ])),
+                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('details', 'show')
-                        ->setLabel('sylius.ui.details'),
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                Action::create('details', 'show')
+                    ->setLabel('sylius.ui.details'),
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                SubItemActionGroup::create(
-                    Action::create('variants', 'list')
-                        ->setLabel('sylius.ui.variants')
-                        ->setOptions([
-                            'links' => [
-                                'index' => [
-                                    'label' => 'sylius.ui.list_variants',
-                                    'route' => 'sylius_admin_product_variant_index',
-                                    'parameters' => [
-                                        'productId' => 'resource.id',
-                                    ],
-                                ],
-                                'create' => [
-                                    'label' => 'sylius.ui.create',
-                                    'route' => 'sylius_admin_product_variant_create',
-                                    'parameters' => [
-                                        'productId' => 'resource.id',
-                                    ],
-                                ],
-                                'generate' => [
-                                    'label' => 'sylius.ui.generate',
-                                    'route' => 'sylius_admin_product_variant_generate',
-                                    'visible' => 'resource.hasOptions',
-                                    'parameters' => [
-                                        'productId' => 'resource.id',
-                                    ],
+            ->withSubItemActions(
+                Action::create('variants', 'list')
+                    ->setLabel('sylius.ui.variants')
+                    ->setOptions([
+                        'links' => [
+                            'index' => [
+                                'label' => 'sylius.ui.list_variants',
+                                'route' => 'sylius_admin_product_variant_index',
+                                'parameters' => [
+                                    'productId' => 'resource.id',
                                ],
                            ],
-                        ]),
-                ),
+                            'create' => [
+                                'label' => 'sylius.ui.create',
+                                'route' => 'sylius_admin_product_variant_create',
+                                'parameters' => [
+                                    'productId' => 'resource.id',
+                                ],
+                            ],
+                            'generate' => [
+                                'label' => 'sylius.ui.generate',
+                                'route' => 'sylius_admin_product_variant_generate',
+                                'visible' => 'resource.hasOptions',
+                                'parameters' => [
+                                    'productId' => 'resource.id',
+                                ],
+                            ],
+                        ],
+                    ]),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }

    public function getResourceClass(): string
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -73,21 +70,16 @@ final class ProductOptionGrid implements ProductOptionGridInterface
                    ->setLabel('sylius.ui.search')
                    ->addFormOption('type', StringFilter::TYPE_CONTAINS),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php
@ -16,8 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -102,46 +100,43 @@ final class ProductReviewGrid implements ProductReviewGridInterface
                    ->addOption('fields', ['reviewSubject.id']),
            )

-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('accept', 'apply_transition')
-                        ->setLabel('sylius.ui.accept')
-                        ->setIcon('tabler:check')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_review_accept',
-                                'parameters' => [
-                                    'id' => 'resource.id',
-                                ],
+            ->withItemActions(
+                Action::create('accept', 'apply_transition')
+                    ->setLabel('sylius.ui.accept')
+                    ->setIcon('tabler:check')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_review_accept',
+                            'parameters' => [
+                                'id' => 'resource.id',
                            ],
-                            'class' => 'btn-success btn-icon',
-                            'show_disabled' => false,
-                            'transition' => 'accept',
-                            'graph' => 'sylius_product_review',
-                        ]),
-                    Action::create('reject', 'apply_transition')
-                        ->setLabel('sylius.ui.reject')
-                        ->setIcon('tabler:x')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_review_reject',
-                                'parameters' => [
-                                    'id' => 'resource.id',
-                                ],
+                        ],
+                        'class' => 'btn-success btn-icon',
+                        'show_disabled' => false,
+                        'transition' => 'accept',
+                        'graph' => 'sylius_product_review',
+                    ]),
+                Action::create('reject', 'apply_transition')
+                    ->setLabel('sylius.ui.reject')
+                    ->setIcon('tabler:x')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_review_reject',
+                            'parameters' => [
+                                'id' => 'resource.id',
                            ],
-                            'class' => 'btn-warning btn-icon',
-                            'show_disabled' => false,
-                            'transition' => 'reject',
-                            'graph' => 'sylius_product_review',
-                        ]),
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+                        ],
+                        'class' => 'btn-warning btn-icon',
+                        'show_disabled' => false,
+                        'transition' => 'reject',
+                        'graph' => 'sylius_product_review',
+                    ]),
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php
@ -14,10 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\SubItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField as SyliusTwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
@ -95,90 +91,82 @@ final class ProductTaxonGrid implements ProductTaxonGridInterface
                    ->setLabel('sylius.ui.channel'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('update_positions', 'update_product_taxon_positions'),
-                ),
+            ->withMainActions(
+                Action::create('update_positions', 'update_product_taxon_positions'),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('details', 'show')
-                        ->setLabel('sylius.ui.details')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_show',
-                                'parameters' => [
-                                    'id' => 'resource.product.id',
-                                ],
+            ->withItemActions(
+                Action::create('details', 'show')
+                    ->setLabel('sylius.ui.details')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_show',
+                            'parameters' => [
+                                'id' => 'resource.product.id',
                            ],
-                        ]),
-                    Action::create('update', 'update')
-                        ->setLabel('sylius.ui.edit')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_update',
-                                'parameters' => [
-                                    'id' => 'resource.product.id',
-                                ],
+                        ],
+                    ]),
+                Action::create('update', 'update')
+                    ->setLabel('sylius.ui.edit')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_update',
+                            'parameters' => [
+                                'id' => 'resource.product.id',
                            ],
-                        ]),
-                    Action::create('delete', 'delete')
-                        ->setLabel('sylius.ui.delete')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_delete',
-                                'parameters' => [
-                                    'id' => 'resource.product.id',
-                                ],
+                        ],
+                    ]),
+                Action::create('delete', 'delete')
+                    ->setLabel('sylius.ui.delete')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_delete',
+                            'parameters' => [
+                                'id' => 'resource.product.id',
                            ],
-                        ]),
-                ),
+                        ],
+                    ]),
            )
-            ->addActionGroup(
-                SubItemActionGroup::create(
-                    Action::create('variants', 'list')
-                        ->setLabel('sylius.ui.variants')
-                        ->setOptions([
-                            'links' => [
-                                'index' => [
-                                    'label' => 'sylius.ui.list_variants',
-                                    'route' => 'sylius_admin_product_variant_index',
-                                    'parameters' => [
-                                        'productId' => 'resource.product.id',
-                                    ],
-                                ],
-                                'create' => [
-                                    'label' => 'sylius.ui.create',
-                                    'route' => 'sylius_admin_product_variant_create',
-                                    'parameters' => [
-                                        'productId' => 'resource.product.id',
-                                    ],
-                                ],
-                                'generate' => [
-                                    'label' => 'sylius.ui.generate',
-                                    'route' => 'sylius_admin_product_variant_generate',
-                                    'visible' => 'resource.product.hasOptions',
-                                    'parameters' => [
-                                        'productId' => 'resource.product.id',
-                                    ],
-                                ],
-                            ],
-                        ]),
-                ),
-            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    Action::create('delete', 'delete')
-                        ->setLabel('sylius.ui.delete_products')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_product_taxon_bulk_delete_products',
+            ->withSubItemActions(
+                Action::create('variants', 'list')
+                    ->setLabel('sylius.ui.variants')
+                    ->setOptions([
+                        'links' => [
+                            'index' => [
+                                'label' => 'sylius.ui.list_variants',
+                                'route' => 'sylius_admin_product_variant_index',
                                'parameters' => [
-                                    'taxonId' => '$taxonId',
+                                    'productId' => 'resource.product.id',
                                ],
                            ],
-                        ]),
-                ),
+                            'create' => [
+                                'label' => 'sylius.ui.create',
+                                'route' => 'sylius_admin_product_variant_create',
+                                'parameters' => [
+                                    'productId' => 'resource.product.id',
+                                ],
+                            ],
+                            'generate' => [
+                                'label' => 'sylius.ui.generate',
+                                'route' => 'sylius_admin_product_variant_generate',
+                                'visible' => 'resource.product.hasOptions',
+                                'parameters' => [
+                                    'productId' => 'resource.product.id',
+                                ],
+                            ],
+                        ],
+                    ]),
+            )
+            ->withBulkActions(
+                Action::create('delete', 'delete')
+                    ->setLabel('sylius.ui.delete_products')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_product_taxon_bulk_delete_products',
+                            'parameters' => [
+                                'taxonId' => '$taxonId',
+                            ],
+                        ],
+                    ]),
            )
        ;
    }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php
@ -18,9 +18,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
 use Sylius\Bundle\GridBundle\Builder\ActionGroup\ActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -87,53 +84,47 @@ final class ProductVariantGrid implements ProductVariantGridInterface
                        ],
                    ]),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('generate', 'generate_variants')
-                        ->setOptions([
-                            'product' => 'expr:service(\'sylius.repository.product\').find($productId)',
-                        ]),
-                    Action::create('update_positions', 'update_product_variant_positions'),
-                    CreateAction::create()
-                        ->setOptions([
-                            'link' => [
-                                'parameters' => [
-                                    'productId' => '$productId',
-                                ],
+            ->withMainActions(
+                Action::create('generate', 'generate_variants')
+                    ->setOptions([
+                        'product' => 'expr:service(\'sylius.repository.product\').find($productId)',
+                    ]),
+                Action::create('update_positions', 'update_product_variant_positions'),
+                CreateAction::create()
+                    ->setOptions([
+                        'link' => [
+                            'parameters' => [
+                                'productId' => '$productId',
                            ],
-                        ]),
-                ),
+                        ],
+                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'id' => 'resource.id',
-                                'productId' => '$productId',
-                            ],
+            ->withItemActions(
+                UpdateAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'productId' => '$productId',
                        ],
-                    ]),
-                    DeleteAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'id' => 'resource.id',
-                                'productId' => '$productId',
-                            ],
+                    ],
+                ]),
+                DeleteAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'productId' => '$productId',
                        ],
-                    ]),
-                ),
+                    ],
+                ]),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'productId' => '$productId',
-                            ],
+            ->withBulkActions(
+                DeleteAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'productId' => '$productId',
                        ],
-                    ]),
-                ),
+                    ],
+                ]),
            )
            ->addActionGroup(
                ActionGroup::create(
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php
@ -15,7 +15,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -63,10 +62,9 @@ final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWith
                    ->setLabel('sylius.ui.name'),
            )

-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('show_product', 'show')
-                        ->setOptions([
+            ->withItemActions(
+                Action::create('show_product', 'show')
+                    ->setOptions([
                        'link' => [
                            'route' => 'sylius_admin_product_show',
                            'parameters' => [
@ -74,16 +72,15 @@ final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWith
                            ],
                        ],
                    ])
-                        ->setLabel('sylius.ui.show_product'),
-                    UpdateAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'id' => 'resource.id',
-                                'productId' => 'resource.product.id',
-                            ],
+                    ->setLabel('sylius.ui.show_product'),
+                UpdateAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'productId' => 'resource.product.id',
                        ],
-                    ]),
-                ),
+                    ],
+                ]),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php
@ -17,9 +17,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\DateTimeField;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
@ -67,59 +64,54 @@ final class PromotionCouponGrid implements PromotionCouponGridInterface
                Filter::create('code', 'string')
                    ->setLabel('sylius.ui.code'),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('generate', 'default')
-                        ->setLabel('sylius.ui.generate')
-                        ->setIcon('tabler:arrows-split')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_admin_promotion_coupon_generate',
-                                'parameters' => [
-                                    'promotionId' => '$promotionId',
-                                ],
+            ->withMainActions(
+                Action::create('generate', 'default')
+                    ->setLabel('sylius.ui.generate')
+                    ->setIcon('tabler:arrows-split')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_admin_promotion_coupon_generate',
+                            'parameters' => [
+                                'promotionId' => '$promotionId',
                            ],
-                        ]),
-                    CreateAction::create()
-                        ->setOptions([
-                            'link' => [
-                                'parameters' => [
-                                    'promotionId' => '$promotionId',
-                                ],
+                        ],
+                    ]),
+                CreateAction::create()
+                    ->setOptions([
+                        'link' => [
+                            'parameters' => [
+                                'promotionId' => '$promotionId',
                            ],
-                        ]),
-                ),
+                        ],
+                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'id' => 'resource.id',
-                                'promotionId' => '$promotionId',
-                            ],
+            ->withItemActions(
+                UpdateAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'promotionId' => '$promotionId',
                        ],
-                    ]),
-                    DeleteAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'id' => 'resource.id',
-                                'promotionId' => '$promotionId',
-                            ],
+                    ],
+                ]),
+                DeleteAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'id' => 'resource.id',
+                            'promotionId' => '$promotionId',
                        ],
-                    ]),
-                ),
+                    ],
+                ]),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create([
-                        'link' => [
-                            'parameters' => [
-                                'promotionId' => '$promotionId',
-                            ],
+            ->withBulkActions(
+                DeleteAction::create([
+                    'link' => [
+                        'parameters' => [
+                            'promotionId' => '$promotionId',
                        ],
-                    ]),
-                ),
-            );
+                    ],
+                ]),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php
@ -18,9 +18,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
 use Sylius\Bundle\GridBundle\Builder\ActionGroup\ActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\ExistsFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
@ -95,17 +92,13 @@ final class PromotionGrid implements PromotionGridInterface
                    ->setDefaultValue(false),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                    Action::create('archive', 'archive'),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
+                Action::create('archive', 'archive'),
            )
            ->addActionGroup(
                ActionGroup::create(
@ -140,10 +133,8 @@ final class PromotionGrid implements PromotionGridInterface
                        ]),
                ),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
+            ->withBulkActions(
+                DeleteAction::create(),
            )
        ;
    }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php
@ -15,7 +15,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\ShowAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
@ -112,11 +111,9 @@ final class ShipmentGrid implements ShipmentGridInterface
                        ],
                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('ship', 'ship_with_tracking_code'),
-                    ShowAction::create(),
-                ),
+            ->withItemActions(
+                Action::create('ship', 'ship_with_tracking_code'),
+                ShowAction::create(),
            );
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -68,21 +65,16 @@ final class ShippingCategoryGrid implements ShippingCategoryGridInterface
                        ],
                    ]),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php
@ -17,9 +17,6 @@ use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\ExistsFilter;
@ -78,22 +75,17 @@ final class ShippingMethodGrid implements ShippingMethodGridInterface
                    ->setLabel('sylius.ui.archival')
                    ->setDefaultValue(false),
            )
-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                    Action::create('archive', 'archive'),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
+                Action::create('archive', 'archive'),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -55,21 +52,16 @@ final class TaxCategoryGrid implements TaxCategoryGridInterface
                    ->addFormOption('type', StringFilter::TYPE_CONTAINS),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\CreateAction;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter;
@ -72,21 +69,16 @@ final class TaxRateGrid implements TaxRateGridInterface
                    ->setLabel('sylius.ui.search'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    CreateAction::create(),
-                ),
+            ->withMainActions(
+                CreateAction::create(),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php
@ -16,9 +16,6 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Action\Action;
 use Sylius\Bundle\GridBundle\Builder\Action\DeleteAction;
 use Sylius\Bundle\GridBundle\Builder\Action\UpdateAction;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\BulkActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -64,56 +61,51 @@ final class ZoneGrid implements ZoneGridInterface
                ->setLabel('sylius.ui.code'),
            )

-            ->addActionGroup(
-                MainActionGroup::create(
-                    Action::create('create', 'links')
-                        ->setLabel('sylius.ui.create')
-                        ->setOptions([
-                            'class' => 'primary',
-                            'icon' => 'tabler:plus',
-                            'header' => [
-                                'icon' => 'tabler:cube',
-                                'label' => 'sylius.ui.type',
-                            ],
-                            'links' => [
-                                'country' => [
-                                    'label' => 'sylius.ui.zone_consisting_of_countries',
-                                    'icon' => 'tabler:plus',
-                                    'route' => 'sylius_admin_zone_create',
-                                    'parameters' => [
-                                        'type' => 'country',
-                                    ],
-                                ],
-                                'province' => [
-                                    'label' => 'sylius.ui.zone_consisting_of_provinces',
-                                    'icon' => 'tabler:plus',
-                                    'route' => 'sylius_admin_zone_create',
-                                    'parameters' => [
-                                        'type' => 'province',
-                                    ],
-                                ],
-                                'zone' => [
-                                    'label' => 'sylius.ui.zone_consisting_of_other_zones',
-                                    'icon' => 'tabler:plus',
-                                    'route' => 'sylius_admin_zone_create',
-                                    'parameters' => [
-                                        'type' => 'zone',
-                                    ],
+            ->withMainActions(
+                Action::create('create', 'links')
+                    ->setLabel('sylius.ui.create')
+                    ->setOptions([
+                        'class' => 'primary',
+                        'icon' => 'tabler:plus',
+                        'header' => [
+                            'icon' => 'tabler:cube',
+                            'label' => 'sylius.ui.type',
+                        ],
+                        'links' => [
+                            'country' => [
+                                'label' => 'sylius.ui.zone_consisting_of_countries',
+                                'icon' => 'tabler:plus',
+                                'route' => 'sylius_admin_zone_create',
+                                'parameters' => [
+                                    'type' => 'country',
                                ],
                            ],
-                        ]),
-                ),
+                            'province' => [
+                                'label' => 'sylius.ui.zone_consisting_of_provinces',
+                                'icon' => 'tabler:plus',
+                                'route' => 'sylius_admin_zone_create',
+                                'parameters' => [
+                                    'type' => 'province',
+                                ],
+                            ],
+                            'zone' => [
+                                'label' => 'sylius.ui.zone_consisting_of_other_zones',
+                                'icon' => 'tabler:plus',
+                                'route' => 'sylius_admin_zone_create',
+                                'parameters' => [
+                                    'type' => 'zone',
+                                ],
+                            ],
+                        ],
+                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    UpdateAction::create(),
-                    DeleteAction::create(),
-                ),
+            ->withItemActions(
+                UpdateAction::create(),
+                DeleteAction::create(),
            )
-            ->addActionGroup(
-                BulkActionGroup::create(
-                    DeleteAction::create(),
-                ),
-            );
+            ->withBulkActions(
+                DeleteAction::create(),
+            )
+        ;
    }
 }
--- a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php
+++ b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php
@ -14,7 +14,6 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ShopBundle\Grid\Account;

 use Sylius\Bundle\GridBundle\Builder\Action\Action;
-use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\DateTimeField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
@ -59,29 +58,27 @@ final class OrderGrid implements OrderGridInterface
                        ],
                    ]),
            )
-            ->addActionGroup(
-                ItemActionGroup::create(
-                    Action::create('show', 'shop_show')
-                        ->setLabel('sylius.ui.show')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_shop_account_order_show',
-                                'parameters' => [
-                                    'number' => 'resource.number',
-                                ],
+            ->withItemActions(
+                Action::create('show', 'shop_show')
+                    ->setLabel('sylius.ui.show')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_shop_account_order_show',
+                            'parameters' => [
+                                'number' => 'resource.number',
                            ],
-                        ]),
-                    Action::create('pay', 'shop_pay')
-                        ->setLabel('sylius.ui.pay')
-                        ->setOptions([
-                            'link' => [
-                                'route' => 'sylius_shop_order_show',
-                                'parameters' => [
-                                    'tokenValue' => 'resource.tokenValue',
-                                ],
+                        ],
+                    ]),
+                Action::create('pay', 'shop_pay')
+                    ->setLabel('sylius.ui.pay')
+                    ->setOptions([
+                        'link' => [
+                            'route' => 'sylius_shop_order_show',
+                            'parameters' => [
+                                'tokenValue' => 'resource.tokenValue',
                            ],
-                        ]),
-                ),
+                        ],
+                    ]),
            );
    }
 }
--- a/symfony.lock
+++ b/symfony.lock
@ -188,9 +188,6 @@
    "knplabs/knp-menu-bundle": {
        "version": "v3.0.0"
    },
-    "laminas/laminas-code": {
-        "version": "3.5.1"
-    },
    "laminas/laminas-stdlib": {
        "version": "3.3.1"
    },