From 6735b8603773461f435c8266d50d64cffe06858e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= Date: Mon, 29 Jun 2026 16:14:39 +0200 Subject: [PATCH] feat(php-grids): Use interfaces for grid names --- src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php | 2 +- .../Bundle/AdminBundle/Grid/AdminUserGridInterface.php | 2 ++ .../Bundle/AdminBundle/Grid/CatalogPromotionGrid.php | 2 +- .../AdminBundle/Grid/CatalogPromotionGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ChannelGridInterface.php | 2 ++ .../Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php | 2 +- .../Grid/ChannelPricingLogEntryGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php | 2 +- .../Bundle/AdminBundle/Grid/CountryGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php | 2 +- .../Bundle/AdminBundle/Grid/CurrencyGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php | 2 +- .../Bundle/AdminBundle/Grid/CustomerGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php | 2 +- .../Bundle/AdminBundle/Grid/CustomerGroupGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php | 2 +- .../Bundle/AdminBundle/Grid/CustomerOrderGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ExchangeRateGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php | 2 +- .../Bundle/AdminBundle/Grid/InventoryGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php | 2 +- src/Sylius/Bundle/AdminBundle/Grid/LocaleGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php | 2 +- src/Sylius/Bundle/AdminBundle/Grid/OrderGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php | 2 +- .../Bundle/AdminBundle/Grid/PaymentGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php | 2 +- .../Bundle/AdminBundle/Grid/PaymentMethodGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php | 2 +- .../AdminBundle/Grid/PaymentRequestGridInterface.php | 2 ++ .../Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php | 2 +- .../Grid/ProductAssociationTypeGridInterface.php | 2 ++ .../Bundle/AdminBundle/Grid/ProductAttributeGrid.php | 2 +- .../AdminBundle/Grid/ProductAttributeGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ProductGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ProductOptionGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ProductReviewGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ProductTaxonGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php | 2 +- .../AdminBundle/Grid/ProductVariantGridInterface.php | 2 ++ .../Grid/ProductVariantWithCatalogPromotionGrid.php | 2 +- .../ProductVariantWithCatalogPromotionGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php | 2 +- .../AdminBundle/Grid/PromotionCouponGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php | 2 +- .../Bundle/AdminBundle/Grid/PromotionGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php | 2 +- .../Bundle/AdminBundle/Grid/ShipmentGridInterface.php | 2 ++ .../Bundle/AdminBundle/Grid/ShippingCategoryGrid.php | 2 +- .../AdminBundle/Grid/ShippingCategoryGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php | 2 +- .../AdminBundle/Grid/ShippingMethodGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php | 2 +- .../Bundle/AdminBundle/Grid/TaxCategoryGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php | 2 +- .../Bundle/AdminBundle/Grid/TaxRateGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php | 2 +- src/Sylius/Bundle/AdminBundle/Grid/TaxonGridInterface.php | 2 ++ src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php | 2 +- src/Sylius/Bundle/AdminBundle/Grid/ZoneGridInterface.php | 2 ++ src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php | 5 ++--- .../Bundle/ShopBundle/Grid/Account/OrderGridInterface.php | 2 ++ src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php | 7 +++---- src/Sylius/Bundle/ShopBundle/Grid/ProductGridInterface.php | 2 ++ .../Bundle/ShopBundle/Resources/config/services/grid.php | 4 ++-- 71 files changed, 110 insertions(+), 42 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php index 1fac644b0f..a0089ed852 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php @@ -26,7 +26,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_admin_user')] +#[AsGrid(name: self::NAME)] final class AdminUserGrid implements AdminUserGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGridInterface.php index da7e54faba..18e88a8c55 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface AdminUserGridInterface { + public const NAME = 'sylius_admin_admin_user'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php index 68e77ea72e..b9a321f84d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php @@ -29,7 +29,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; use Sylius\Component\Promotion\Model\CatalogPromotionStates; -#[AsGrid(name: 'sylius_admin_catalog_promotion')] +#[AsGrid(name: self::NAME)] final class CatalogPromotionGrid implements CatalogPromotionGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGridInterface.php index d2db767d19..2a81fedb80 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CatalogPromotionGridInterface { + public const NAME = 'sylius_admin_catalog_promotion'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php index 008ec67494..113dda6950 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php @@ -25,7 +25,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_channel')] +#[AsGrid(name: self::NAME)] final class ChannelGrid implements ChannelGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGridInterface.php index 47f993c8d9..12866d2950 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ChannelGridInterface { + public const NAME = 'sylius_admin_channel'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php index fa811cd6cf..51f02fe5ee 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php @@ -19,7 +19,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_channel_pricing_log_entry')] +#[AsGrid(name: self::NAME)] final class ChannelPricingLogEntryGrid implements ChannelPricingLogEntryGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGridInterface.php index 5f41113e0d..181ea8124a 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ChannelPricingLogEntryGridInterface { + public const NAME = 'sylius_admin_channel_pricing_log_entry'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php index 56955471bc..39594d4719 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php @@ -22,7 +22,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_country')] +#[AsGrid(name: self::NAME)] final class CountryGrid implements CountryGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CountryGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CountryGridInterface.php index 6fbe321b38..e4aa49b700 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CountryGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CountryGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CountryGridInterface { + public const NAME = 'sylius_admin_country'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php index 67ff3d5c0b..546a4515d8 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php @@ -21,7 +21,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_currency')] +#[AsGrid(name: self::NAME)] final class CurrencyGrid implements CurrencyGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGridInterface.php index aea6fcf350..3abcfe29be 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CurrencyGridInterface { + public const NAME = 'sylius_admin_currency'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php index 5fe90566c6..8eab73f6ab 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php @@ -26,7 +26,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_customer')] +#[AsGrid(name: self::NAME)] final class CustomerGrid implements CustomerGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGridInterface.php index 1a0bb973eb..e00df73f1f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CustomerGridInterface { + public const NAME = 'sylius_admin_customer'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php index 2950208ed8..ffddd5b4f9 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_customer_group')] +#[AsGrid(name: self::NAME)] final class CustomerGroupGrid implements CustomerGroupGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGridInterface.php index 29858fc8b4..c4986f689c 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CustomerGroupGridInterface { + public const NAME = 'sylius_admin_customer_group'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php index f50f9cbd62..3a44cb3de2 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php @@ -18,7 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_customer_order')] +#[AsGrid(name: self::NAME)] final class CustomerOrderGrid implements CustomerOrderGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGridInterface.php index 06dc6f18bd..250c4ee73f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface CustomerOrderGridInterface { + public const NAME = 'sylius_admin_customer_order'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php index da399ff2ae..c2ac30f386 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_exchange_rate')] +#[AsGrid(name: self::NAME)] final class ExchangeRateGrid implements ExchangeRateGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGridInterface.php index cf71f893c0..b3b125d369 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ExchangeRateGridInterface { + public const NAME = 'sylius_admin_exchange_rate'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php index 9e4079cb36..c54ffcab61 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php @@ -21,7 +21,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_inventory')] +#[AsGrid(name: self::NAME)] final class InventoryGrid implements InventoryGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGridInterface.php index b9c04d8e5c..39a5127cff 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface InventoryGridInterface { + public const NAME = 'sylius_admin_inventory'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php index e5d3b86a6e..c2114b91a1 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php @@ -22,7 +22,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_locale')] +#[AsGrid(name: self::NAME)] final class LocaleGrid implements LocaleGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGridInterface.php index 93c91e3efe..591801835f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface LocaleGridInterface { + public const NAME = 'sylius_admin_locale'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php index 5aa042118f..3ea6bd7cdb 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php @@ -23,7 +23,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_order')] +#[AsGrid(name: self::NAME)] final class OrderGrid implements OrderGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/OrderGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/OrderGridInterface.php index 017fa4eee1..8ba25150db 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/OrderGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/OrderGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface OrderGridInterface { + public const NAME = 'sylius_admin_order'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php index d0d0a8180d..b92bb811d9 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php @@ -20,7 +20,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_payment')] +#[AsGrid(name: self::NAME)] final class PaymentGrid implements PaymentGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGridInterface.php index 012dd1bdf6..722b156584 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface PaymentGridInterface { + public const NAME = 'sylius_admin_payment'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php index 588cf0b773..d4cfe20718 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php @@ -25,7 +25,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_payment_method')] +#[AsGrid(name: self::NAME)] final class PaymentMethodGrid implements PaymentMethodGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGridInterface.php index 5042e1c70a..1507ca193f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface PaymentMethodGridInterface { + public const NAME = 'sylius_admin_payment_method'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php index 24de399243..f9dfd44de2 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php @@ -23,7 +23,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; use Sylius\Component\Payment\Model\PaymentRequestInterface; -#[AsGrid(name: 'sylius_admin_payment_request')] +#[AsGrid(name: self::NAME)] final class PaymentRequestGrid implements PaymentRequestGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGridInterface.php index 563ebb9f41..e535f6e3be 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface PaymentRequestGridInterface { + public const NAME = 'sylius_admin_payment_request'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php index 605ddcdf6f..0965a5687f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_association_type')] +#[AsGrid(name: self::NAME)] final class ProductAssociationTypeGrid implements ProductAssociationTypeGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGridInterface.php index 96da923c30..371638dd72 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductAssociationTypeGridInterface { + public const NAME = 'sylius_admin_product_association_type'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php index 3ddf9a93d1..13a9b7d0a6 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php @@ -35,7 +35,7 @@ use Sylius\Component\Attribute\AttributeType\TextareaAttributeType; use Sylius\Component\Attribute\AttributeType\TextAttributeType; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_attribute')] +#[AsGrid(name: self::NAME)] final class ProductAttributeGrid implements ProductAttributeGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGridInterface.php index 5cf9a4eab8..6a444ca4fe 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductAttributeGridInterface { + public const NAME = 'sylius_admin_product_attribute'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php index a79726b7b3..c8612ea310 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php @@ -28,7 +28,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product')] +#[AsGrid(name: self::NAME)] final class ProductGrid implements ProductGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductGridInterface.php index 40ec104c46..2cae130c04 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductGridInterface { + public const NAME = 'sylius_admin_product'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php index 6229388aa3..ea77adc306 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_option')] +#[AsGrid(name: self::NAME)] final class ProductOptionGrid implements ProductOptionGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGridInterface.php index dcf2026dce..3e8be4a8a0 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductOptionGridInterface { + public const NAME = 'sylius_admin_product_option'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php index 470b9f35cf..c06898877f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php @@ -25,7 +25,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_review')] +#[AsGrid(name: self::NAME)] final class ProductReviewGrid implements ProductReviewGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGridInterface.php index 87335dd91c..f6682d0ccc 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductReviewGridInterface { + public const NAME = 'sylius_admin_product_review'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php index 29cdde414e..a354ff19b8 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php @@ -26,7 +26,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_taxon')] +#[AsGrid(name: self::NAME)] final class ProductTaxonGrid implements ProductTaxonGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGridInterface.php index 0a0cf101d2..9ab125c379 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductTaxonGridInterface { + public const NAME = 'sylius_admin_product_taxon'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php index 3baab4bfac..bbb7f32553 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php @@ -27,7 +27,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_variant')] +#[AsGrid(name: self::NAME)] final class ProductVariantGrid implements ProductVariantGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGridInterface.php index 91c1f03901..cb599a059f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductVariantGridInterface { + public const NAME = 'sylius_admin_product_variant'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php index cae046cf03..d044addc7d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php @@ -23,7 +23,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_product_variant_with_catalog_promotion')] +#[AsGrid(name: self::NAME)] final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWithCatalogPromotionGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGridInterface.php index b91b25041b..46005c658c 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductVariantWithCatalogPromotionGridInterface { + public const NAME = 'sylius_admin_product_variant_with_catalog_promotion'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php index d3a622448a..1bef2af25f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php @@ -27,7 +27,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_promotion_coupon')] +#[AsGrid(name: self::NAME)] final class PromotionCouponGrid implements PromotionCouponGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGridInterface.php index 2702624493..9a2b1b7f8d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface PromotionCouponGridInterface { + public const NAME = 'sylius_admin_promotion_coupon'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php index a01e4bd75c..29e726d09c 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php @@ -28,7 +28,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_promotion')] +#[AsGrid(name: self::NAME)] final class PromotionGrid implements PromotionGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGridInterface.php index f113560ae6..306ef13d31 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface PromotionGridInterface { + public const NAME = 'sylius_admin_promotion'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php index f9d304ae75..0f782a7bbf 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php @@ -22,7 +22,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_shipment')] +#[AsGrid(name: self::NAME)] final class ShipmentGrid implements ShipmentGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGridInterface.php index 515ff87339..998d5f18a0 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ShipmentGridInterface { + public const NAME = 'sylius_admin_shipment'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php index 1539b201a5..8463116b26 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_shipping_category')] +#[AsGrid(name: self::NAME)] final class ShippingCategoryGrid implements ShippingCategoryGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGridInterface.php index 25327d5ffb..48be1e0f51 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ShippingCategoryGridInterface { + public const NAME = 'sylius_admin_shipping_category'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php index d171803c85..8979e449fb 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php @@ -28,7 +28,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_shipping_method')] +#[AsGrid(name: self::NAME)] final class ShippingMethodGrid implements ShippingMethodGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGridInterface.php index a4175a89b4..fb31bb9286 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ShippingMethodGridInterface { + public const NAME = 'sylius_admin_shipping_method'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php index 7f78ec5977..b7a98f44c9 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_tax_category')] +#[AsGrid(name: self::NAME)] final class TaxCategoryGrid implements TaxCategoryGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGridInterface.php index 7cc409d64f..43aa476e24 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface TaxCategoryGridInterface { + public const NAME = 'sylius_admin_tax_category'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php index 19f58ea6ba..6337f02246 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php @@ -27,7 +27,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_tax_rate')] +#[AsGrid(name: self::NAME)] final class TaxRateGrid implements TaxRateGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGridInterface.php index 229bbe577c..439118ac61 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface TaxRateGridInterface { + public const NAME = 'sylius_admin_tax_rate'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php index eb90f846b9..fb72a65b76 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php @@ -8,7 +8,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_taxon')] +#[AsGrid(name: self::NAME)] final class TaxonGrid implements TaxonGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGridInterface.php index 16acb7653d..e4755250ab 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface TaxonGridInterface { + public const NAME = 'sylius_admin_taxon'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php index 65b7800d12..91221d4c3f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php @@ -24,7 +24,7 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_admin_zone')] +#[AsGrid(name: self::NAME)] final class ZoneGrid implements ZoneGridInterface { public function __construct( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGridInterface.php b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGridInterface.php index 877d48a4b7..edaa5f0ad3 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGridInterface.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ZoneGridInterface { + public const NAME = 'sylius_admin_zone'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php index a412feaecb..51d0cb393f 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php @@ -18,11 +18,10 @@ 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; -use Sylius\Bundle\GridBundle\Grid\AbstractGrid; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_shop_account_order')] -final class OrderGrid extends AbstractGrid implements OrderGridInterface +#[AsGrid(name: self::NAME)] +final class OrderGrid implements OrderGridInterface { public function __construct( private readonly string $orderClass, diff --git a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGridInterface.php b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGridInterface.php index 4aa238bfca..5bbf0ea423 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGridInterface.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface OrderGridInterface { + public const NAME = 'sylius_shop_account_order'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php index 429ea71781..4bd7d3913f 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php @@ -18,11 +18,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\Field; use Sylius\Bundle\GridBundle\Builder\Field\StringField; use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; -use Sylius\Bundle\GridBundle\Grid\AbstractGrid; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: 'sylius_shop_product')] -final class ProductGrid extends AbstractGrid implements ProductGridInterface +#[AsGrid(name: self::NAME)] +final class ProductGrid implements ProductGridInterface { public function __construct( private readonly string $productClass, @@ -36,7 +35,7 @@ final class ProductGrid extends AbstractGrid implements ProductGridInterface 'channel' => "expr:service('sylius.context.channel').getChannel()", 'taxon' => "expr:notFoundOnNull(service('sylius.repository.taxon').findOneBySlug(\$slug, service('sylius.context.locale').getLocaleCode()))", 'locale' => "expr:service('sylius.context.locale').getLocaleCode()", - 'sorting' => "expr:service('request_stack').getCurrentRequest().get('sorting', [])", + 'sorting' => "expr:service('request_stack').getCurrentRequest().query.all('sorting')", 'includeAllDescendants' => "expr:parameter('sylius_shop.product_grid.include_all_descendants')", ]) ->setDriverOption('class', $this->productClass) diff --git a/src/Sylius/Bundle/ShopBundle/Grid/ProductGridInterface.php b/src/Sylius/Bundle/ShopBundle/Grid/ProductGridInterface.php index ba0552a685..12906bcb1a 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/ProductGridInterface.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/ProductGridInterface.php @@ -18,5 +18,7 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; /** @experimental */ interface ProductGridInterface { + public const NAME = 'sylius_shop_product'; + public function __invoke(GridBuilderInterface $gridBuilder): void; } diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php b/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php index bbabf18320..1c3a2aa749 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php @@ -20,7 +20,7 @@ return static function (ContainerConfigurator $container) { ->args([ '%sylius.model.order.class%', ]) - ->tag('sylius.grid') + ->tag('sylius.invokable_grid') ; $services->alias(\Sylius\Bundle\ShopBundle\Grid\Account\OrderGridInterface::class, "sylius_shop.grid.account.order"); @@ -29,7 +29,7 @@ return static function (ContainerConfigurator $container) { ->args([ '%sylius.model.product.class%', ]) - ->tag('sylius.grid') + ->tag('sylius.invokable_grid') ; $services->alias(\Sylius\Bundle\ShopBundle\Grid\ProductGridInterface::class,"sylius_shop.grid.product");