diff --git a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php index 5a92713ecd..c01dcaa34b 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php @@ -26,18 +26,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.admin_user.class%', name: self::NAME)] final class AdminUserGrid implements AdminUserGridInterface { - public function __construct( - private readonly string $adminUserClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->adminUserClass) ->addOrderBy('createdAt', 'desc') ->setLimits([10, 25, 50]) ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php index f095dd963a..cf331a879c 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php @@ -29,11 +29,10 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; use Sylius\Component\Promotion\Model\CatalogPromotionStates; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.catalog_promotion.class%', name: self::NAME)] final class CatalogPromotionGrid implements CatalogPromotionGridInterface { public function __construct( - private readonly string $catalogPromotionClass, private readonly string $channelClass, ) { } @@ -41,7 +40,6 @@ final class CatalogPromotionGrid implements CatalogPromotionGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->catalogPromotionClass) ->setLimits([10, 25, 50]) ->addOrderBy('code', 'asc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php index 79ae666535..0c95b9eb41 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php @@ -25,18 +25,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.channel.class%', name: self::NAME)] final class ChannelGrid implements ChannelGridInterface { - public function __construct( - private readonly string $channelClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->channelClass) ->setLimits([10, 25, 50]) ->addOrderBy('nameAndDescription', 'asc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php index 75e9605a63..2ac7acb561 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php @@ -19,18 +19,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.channel_pricing_log_entry.class%', name: self::NAME)] final class ChannelPricingLogEntryGrid implements ChannelPricingLogEntryGridInterface { - public function __construct( - private readonly string $channelPricingLogEntryClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->channelPricingLogEntryClass) ->setRepositoryMethod('createByChannelPricingIdListQueryBuilder', [ '$channelPricingId', ]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php index 6b0b85b4b2..293527ec4c 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php @@ -22,18 +22,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.country.class%', name: self::NAME)] final class CountryGrid implements CountryGridInterface { - public function __construct( - private readonly string $countryClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->countryClass) ->setLimits([10, 25, 50]) ->addOrderBy('code', 'asc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php index 175f6e3293..deaebfb324 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php @@ -21,18 +21,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.currency.class%', name: self::NAME)] final class CurrencyGrid implements CurrencyGridInterface { - public function __construct( - private readonly string $currencyClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->currencyClass) ->setLimits([10, 25, 50]) ->addOrderBy('code', 'asc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php index a9759c2044..0f2740d4d1 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php @@ -26,11 +26,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.customer.class%', name: self::NAME)] final class CustomerGrid implements CustomerGridInterface { public function __construct( - private readonly string $customerClass, private readonly string $customerGroupClass, ) { } @@ -38,7 +37,6 @@ final class CustomerGrid implements CustomerGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->customerClass) ->setLimits([10, 25, 50]) ->addOrderBy('createdAt', 'desc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php index 893a0acbde..c6a8fb8a5b 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.customer_group.class%', name: self::NAME)] final class CustomerGroupGrid implements CustomerGroupGridInterface { - public function __construct( - private readonly string $customerGroupClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->customerGroupClass) ->addOrderBy('name', 'asc') ->setLimits([10, 25, 50]) ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php index 0bc7e4d795..93917cdd54 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php @@ -18,18 +18,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.order.class%', name: self::NAME)] final class CustomerOrderGrid implements CustomerOrderGridInterface { - public function __construct( - private readonly string $orderClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->orderClass) ->setRepositoryMethod('createByCustomerIdCriteriaAwareQueryBuilder', [ 'criteria' => null, 'customerId' => '$id', diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php index 2c34661fe0..af3932a8a8 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php @@ -24,11 +24,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.exchange_rate.class%', name: self::NAME)] final class ExchangeRateGrid implements ExchangeRateGridInterface { public function __construct( - private readonly string $exchangeRateClass, private readonly string $currencyClass, ) { } @@ -36,7 +35,6 @@ final class ExchangeRateGrid implements ExchangeRateGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->exchangeRateClass) ->setLimits([10, 25, 50]) ->addOrderBy('id', 'desc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php index 7589c748c8..321914e561 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php @@ -21,11 +21,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_variant.class%', name: self::NAME)] final class InventoryGrid implements InventoryGridInterface { public function __construct( - private readonly string $productVariantClass, private readonly string $productClass, ) { } @@ -33,7 +32,6 @@ final class InventoryGrid implements InventoryGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productVariantClass) ->setLimits([10, 25, 50]) ->addOrderBy('name', 'asc') ->setRepositoryMethod('createInventoryListQueryBuilder', [ diff --git a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php index 8b820362a6..01b80cb0b3 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php @@ -22,18 +22,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.locale.class%', name: self::NAME)] final class LocaleGrid implements LocaleGridInterface { - public function __construct( - private readonly string $localeClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->localeClass) ->setLimits([10, 25, 50]) ->addOrderBy('code', 'asc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php index 654cbf5cbf..ee943df5c2 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php @@ -23,11 +23,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.order.class%', name: self::NAME)] final class OrderGrid implements OrderGridInterface { public function __construct( - private readonly string $orderClass, private readonly string $channelClass, private readonly string $customerClass, private readonly string $productClass, @@ -39,7 +38,6 @@ final class OrderGrid implements OrderGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->orderClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod( 'createCriteriaAwareSearchListQueryBuilder', diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php index fff9616555..b8879c99f6 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php @@ -20,11 +20,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.payment.class%', name: self::NAME)] final class PaymentGrid implements PaymentGridInterface { public function __construct( - private readonly string $paymentClass, private readonly string $channelClass, ) { } @@ -32,7 +31,6 @@ final class PaymentGrid implements PaymentGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->paymentClass) ->setRepositoryMethod('createListQueryBuilder') ->addOrderBy('createdAt', 'desc') ->setLimits([10, 25, 50]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php index e4c65c3f88..650ae5f3c6 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php @@ -25,18 +25,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.payment_method.class%', name: self::NAME)] final class PaymentMethodGrid implements PaymentMethodGridInterface { - public function __construct( - private readonly string $paymentMethodClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->paymentMethodClass) ->setRepositoryMethod('createListQueryBuilder', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', ]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php index 8664a95a38..0e53d60828 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php @@ -23,18 +23,16 @@ use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; use Sylius\Component\Payment\Model\PaymentRequestInterface; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.payment_request.class%', name: self::NAME)] final class PaymentRequestGrid implements PaymentRequestGridInterface { public function __construct( - private readonly string $paymentRequestClass, private readonly string $paymentMethodClass, ) { } public function __invoke(GridBuilderInterface $gridBuilder): void { - $gridBuilder->setDriverOption('class', $this->paymentRequestClass); $gridBuilder->setRepositoryMethod('createQueryBuilderForPayment', [ 'paymentId' => '$paymentId', ]); diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php index d4ac90949b..ec9e13a2fc 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_association_type.class%', name: self::NAME)] final class ProductAssociationTypeGrid implements ProductAssociationTypeGridInterface { - public function __construct( - private readonly string $productAssociationTypeClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productAssociationTypeClass) ->setRepositoryMethod('createListQueryBuilder', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', ]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php index 38aa0627a7..64fac46ffa 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php @@ -35,18 +35,12 @@ use Sylius\Component\Attribute\AttributeType\TextareaAttributeType; use Sylius\Component\Attribute\AttributeType\TextAttributeType; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_attribute.class%', name: self::NAME)] final class ProductAttributeGrid implements ProductAttributeGridInterface { - public function __construct( - private readonly string $productAttributeClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productAttributeClass) ->setRepositoryMethod('createListQueryBuilder', [ "expr:service('sylius.context.locale').getLocaleCode()", ]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php index 2ea9785c6c..1844b5234c 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: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product.class%', name: self::NAME)] final class ProductGrid implements ProductGridInterface { public function __construct( @@ -41,7 +41,6 @@ final class ProductGrid implements ProductGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productClass) ->setRepositoryMethod('createListQueryBuilder', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', ]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php index 4ca7b95af2..119318c764 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_option.class%', name: self::NAME)] final class ProductOptionGrid implements ProductOptionGridInterface { - public function __construct( - private readonly string $productOptionClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productOptionClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createListQueryBuilder', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php index 5d6521edc9..9e969362c7 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php @@ -25,11 +25,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_review.class%', name: self::NAME)] final class ProductReviewGrid implements ProductReviewGridInterface { public function __construct( - private readonly string $productReviewClass, private readonly string $productClass, ) { } @@ -37,7 +36,6 @@ final class ProductReviewGrid implements ProductReviewGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productReviewClass) ->setLimits([10, 25, 50]) ->addOrderBy('date', 'desc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php index 2d9678fb3e..fb352fdc09 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php @@ -26,11 +26,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_taxon.class%', name: self::NAME)] final class ProductTaxonGrid implements ProductTaxonGridInterface { public function __construct( - private readonly string $productTaxonClass, private readonly string $channelClass, ) { } @@ -38,7 +37,6 @@ final class ProductTaxonGrid implements ProductTaxonGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productTaxonClass) ->addOrderBy('position', 'asc') ->setLimits([10, 25, 50]) ->setRepositoryMethod('createListQueryBuilderForTaxon', [ diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php index 89d314af42..d41fd7a658 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php @@ -27,18 +27,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_variant.class%', name: self::NAME)] final class ProductVariantGrid implements ProductVariantGridInterface { - public function __construct( - private readonly string $productVariantClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productVariantClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createQueryBuilderByProductId', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php index 05e0636123..81a64e5d6d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php @@ -23,11 +23,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product_variant.class%', name: self::NAME)] final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWithCatalogPromotionGridInterface { public function __construct( - private readonly string $productVariantClass, private readonly string $locale, ) { } @@ -35,7 +34,6 @@ final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWith public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->productVariantClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createCatalogPromotionListQueryBuilder', [ $this->locale, diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php index 8d49572570..3c69ddbef7 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php @@ -27,18 +27,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.promotion_coupon.class%', name: self::NAME)] final class PromotionCouponGrid implements PromotionCouponGridInterface { - public function __construct( - private readonly string $promotionCouponClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->promotionCouponClass) ->setLimits([10, 25, 50]) ->orderBy('used', 'desc') ->setRepositoryMethod('createQueryBuilderByPromotionId', [ diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php index a3c4b8e18c..bf08bacb49 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php @@ -28,18 +28,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.promotion.class%', name: self::NAME)] final class PromotionGrid implements PromotionGridInterface { - public function __construct( - private readonly string $promotionClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->promotionClass) ->setLimits([10, 25, 50]) ->addOrderBy('priority', 'desc') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php index 07d69610bd..6e1cee7f2b 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php @@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.shipment.class%', name: self::NAME)] final class ShipmentGrid implements ShipmentGridInterface { public function __construct( - private readonly string $shipmentClass, private readonly string $channelClass, private readonly string $shippingMethodClass, ) { @@ -35,7 +34,6 @@ final class ShipmentGrid implements ShipmentGridInterface public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->shipmentClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createListQueryBuilder') ->addOrderBy('createdAt', 'desc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php index 4bde4a85d8..c2df1fa584 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.shipping_category.class%', name: self::NAME)] final class ShippingCategoryGrid implements ShippingCategoryGridInterface { - public function __construct( - private readonly string $shippingCategoryClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->shippingCategoryClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createListQueryBuilder') ->withFields( diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php index f7d91ffa4c..4351ef59dd 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php @@ -28,18 +28,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.shipping_method.class%', name: self::NAME)] final class ShippingMethodGrid implements ShippingMethodGridInterface { - public function __construct( - private readonly string $shippingMethodClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->shippingMethodClass) ->setLimits([10, 25, 50]) ->setRepositoryMethod('createListQueryBuilder', [ 'expr:service(\'sylius.context.locale\').getLocaleCode()', diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php index e9b8b1d46a..7e3689ac6f 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.tax_category.class%', name: self::NAME)] final class TaxCategoryGrid implements TaxCategoryGridInterface { - public function __construct( - private readonly string $taxCategoryClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->taxCategoryClass) ->setLimits([10, 25, 50]) ->addOrderBy('nameAndDescription', 'asc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php index 245fe7c577..7c5339db22 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php @@ -27,18 +27,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.tax_rate.class%', name: self::NAME)] final class TaxRateGrid implements TaxRateGridInterface { - public function __construct( - private readonly string $taxRateClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->taxRateClass) ->setLimits([10, 25, 50]) ->addOrderBy('name', 'asc') diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php index 564d751786..a95f4f1382 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php @@ -17,18 +17,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.taxon.class%', name: self::NAME)] final class TaxonGrid implements TaxonGridInterface { - public function __construct( - private readonly string $taxonClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->taxonClass) ->setRepositoryMethod('createListQueryBuilder') ->setLimits([10, 25, 50]) diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php index a06f54f5d9..d8aa97642d 100644 --- a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php +++ b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php @@ -24,18 +24,12 @@ use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.zone.class%', name: self::NAME)] final class ZoneGrid implements ZoneGridInterface { - public function __construct( - private readonly string $resourceClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder - ->setDriverOption('class', $this->resourceClass) ->setLimits([10, 25, 50]) ->addOrderBy('priority', 'desc') diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php b/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php index a016ab6a2e..de9a442ab1 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php @@ -97,9 +97,6 @@ return static function (ContainerConfigurator $container) { ; $services->set('sylius_admin.grid.admin_user', AdminUserGrid::class) - ->args([ - '%sylius.model.admin_user.class%', - ]) ->tag('sylius.invokable_grid') ; @@ -107,7 +104,6 @@ return static function (ContainerConfigurator $container) { $services->set('sylius_admin.grid.catalog_promotion', CatalogPromotionGrid::class) ->args([ - '%sylius.model.catalog_promotion.class%', '%sylius.model.channel.class%', ]) ->tag('sylius.invokable_grid') @@ -115,24 +111,17 @@ return static function (ContainerConfigurator $container) { $services->alias(CatalogPromotionGridInterface::class, 'sylius_admin.grid.catalog_promotion'); $services->set('sylius_admin.grid.channel', ChannelGrid::class) - ->args([ - '%sylius.model.channel.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ChannelGridInterface::class, 'sylius_admin.grid.channel'); $services->set('sylius_admin.grid.currency', CurrencyGrid::class) - ->args([ - '%sylius.model.currency.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(CurrencyGridInterface::class, 'sylius_admin.grid.currency'); $services->set('sylius_admin.grid.customer', CustomerGrid::class) ->args([ - '%sylius.model.customer.class%', '%sylius.model.customer_group.class%', ]) ->tag('sylius.invokable_grid') @@ -140,24 +129,17 @@ return static function (ContainerConfigurator $container) { $services->alias(CustomerGridInterface::class, 'sylius_admin.grid.customer'); $services->set('sylius_admin.grid.customer_group', CustomerGroupGrid::class) - ->args([ - '%sylius.model.customer_group.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(CustomerGroupGridInterface::class, 'sylius_admin.grid.customer_group'); $services->set('sylius_admin.grid.locale', LocaleGrid::class) - ->args([ - '%sylius.model.locale.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(LocaleGridInterface::class, 'sylius_admin.grid.locale'); $services->set('sylius_admin.grid.inventory', InventoryGrid::class) ->args([ - '%sylius.model.product_variant.class%', '%sylius.model.product.class%', ]) ->tag('sylius.invokable_grid') @@ -165,32 +147,22 @@ return static function (ContainerConfigurator $container) { $services->alias(InventoryGridInterface::class, 'sylius_admin.grid.inventory'); $services->set('sylius_admin.grid.payment_method', PaymentMethodGrid::class) - ->args([ - '%sylius.model.payment_method.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(PaymentMethodGridInterface::class, 'sylius_admin.grid.payment_method'); $services->set('sylius_admin.grid.product_association_type', ProductAssociationTypeGrid::class) - ->args([ - '%sylius.model.product_association_type.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ProductAssociationTypeGridInterface::class, 'sylius_admin.grid.product_association_type'); $services->set('syllabus_admin.grid.taxon', TaxonGrid::class) - ->args([ - '%sylius.model.taxon.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(TaxonGridInterface::class, 'sylius_admin.grid.taxon'); $services->set('sylius_admin.grid.product_taxon', ProductTaxonGrid::class) ->args([ - '%sylius.model.product_taxon.class%', '%sylius.model.channel.class%', ]) ->tag('sylius.invokable_grid') @@ -208,24 +180,17 @@ return static function (ContainerConfigurator $container) { $services->alias(ProductGridInterface::class, 'sylius_admin.grid.product'); $services->set('sylius_admin.grid.product_attribute', ProductAttributeGrid::class) - ->args([ - '%sylius.model.product_attribute.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ProductAttributeGridInterface::class, 'sylius_admin.grid.product_attribute'); $services->set('sylius_admin.grid.product_variant', ProductVariantGrid::class) - ->args([ - '%sylius.model.product_variant.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ProductVariantGridInterface::class, 'sylius_admin.grid.product_variant'); $services->set('sylius_admin.grid.product_variant_with_catalog_promotion', ProductVariantWithCatalogPromotionGrid::class) ->args([ - '%sylius.model.product_variant.class%', '%locale%', ]) ->tag('sylius.invokable_grid') @@ -233,16 +198,12 @@ return static function (ContainerConfigurator $container) { $services->alias(ProductVariantWithCatalogPromotionGridInterface::class, 'sylius_admin.grid.product_variant_with_catalog_promotion'); $services->set('sylius_admin.grid.country', CountryGrid::class) - ->args([ - '%sylius.model.country.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(CountryGridInterface::class, 'sylius_admin.grid.country'); $services->set('sylius_admin.grid.shipment', ShipmentGrid::class) ->args([ - '%sylius.model.shipment.class%', '%sylius.model.channel.class%', '%sylius.model.shipping_method.class%', ]) @@ -251,57 +212,36 @@ return static function (ContainerConfigurator $container) { $services->alias(ShipmentGridInterface::class, 'sylius_admin.grid.shipment'); $services->set('sylius_admin.grid.shipping_category', ShippingCategoryGrid::class) - ->args([ - '%sylius.model.shipping_category.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ShippingCategoryGridInterface::class, 'sylius_admin.grid.shipping_category'); $services->set('sylius_admin.grid.shipping_method', ShippingMethodGrid::class) - ->args([ - '%sylius.model.shipping_method.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ShippingMethodGridInterface::class, 'sylius_admin.grid.shipping_method'); $services->set('sylius_admin.grid.tax_category', TaxCategoryGrid::class) - ->args([ - '%sylius.model.tax_category.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(TaxCategoryGridInterface::class, 'sylius_admin.grid.tax_category'); $services->set('sylius_admin.grid.tax_rate', TaxRateGrid::class) - ->args([ - '%sylius.model.tax_rate.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(TaxRateGridInterface::class, 'sylius_admin.grid.tax_rate'); $services->set('sylius_admin.grid.promotion_coupon', PromotionCouponGrid::class) - ->args([ - '%sylius.model.promotion_coupon.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(PromotionCouponGridInterface::class, 'sylius_admin.grid.promotion_coupon'); $services->set('sylius_admin.grid.promotion', PromotionGrid::class) - ->args([ - '%sylius.model.promotion.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(PromotionGridInterface::class, 'sylius_admin.grid.promotion'); $services->set('sylius_admin.grid.zone', ZoneGrid::class) - ->args([ - '%sylius.model.zone.class%', - ]) ->tag('sylius.invokable_grid') ; @@ -309,7 +249,6 @@ return static function (ContainerConfigurator $container) { $services->set('sylius_admin.grid.payment', PaymentGrid::class) ->args([ - '%sylius.model.payment.class%', '%sylius.model.channel.class%', ]) ->tag('sylius.invokable_grid') @@ -317,16 +256,12 @@ return static function (ContainerConfigurator $container) { $services->alias(PaymentGridInterface::class, 'sylius_admin.grid.payment'); $services->set('sylius_admin.grid.customer_order', CustomerOrderGrid::class) - ->args([ - '%sylius.model.order.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(CustomerOrderGridInterface::class, 'sylius_admin.grid.customer_order'); $services->set('sylius_admin.grid.order', OrderGrid::class) ->args([ - '%sylius.model.order.class%', '%sylius.model.channel.class%', '%sylius.model.customer.class%', '%sylius.model.product.class%', @@ -340,7 +275,6 @@ return static function (ContainerConfigurator $container) { $services->set('sylius_admin.grid.exchange_rate', ExchangeRateGrid::class) ->args([ - '%sylius.model.exchange_rate.class%', '%sylius.model.currency.class%', ]) ->tag('sylius.invokable_grid') @@ -348,16 +282,12 @@ return static function (ContainerConfigurator $container) { $services->alias(ExchangeRateGridInterface::class, 'sylius_admin.grid.exchange_rate'); $services->set('sylius_admin.grid.product_option', ProductOptionGrid::class) - ->args([ - '%sylius.model.product_option.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ProductOptionGridInterface::class, 'sylius_admin.grid.product_option'); $services->set('sylius_admin.grid.product_review', ProductReviewGrid::class) ->args([ - '%sylius.model.product_review.class%', '%sylius.model.product.class%', ]) ->tag('sylius.invokable_grid') @@ -365,16 +295,12 @@ return static function (ContainerConfigurator $container) { $services->alias(ProductReviewGridInterface::class, 'sylius_admin.grid.product_review'); $services->set('sylius_admin.grid.channel_pricing_log_entry', ChannelPricingLogEntryGrid::class) - ->args([ - '%sylius.model.channel_pricing_log_entry.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(ChannelPricingLogEntryGridInterface::class, 'sylius_admin.grid.channel_pricing_log_entry'); $services->set('sylius_admin.grid.payment_request', PaymentRequestGrid::class) ->args([ - '%sylius.model.payment_request.class%', '%sylius.model.payment_method.class%', ]) ->tag('sylius.invokable_grid') diff --git a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php index 425fd0826d..93e7711ee2 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/Account/OrderGrid.php @@ -20,14 +20,9 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.order.class%', name: self::NAME)] final class OrderGrid implements OrderGridInterface { - public function __construct( - private readonly string $orderClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder @@ -35,7 +30,6 @@ final class OrderGrid implements OrderGridInterface "expr:service('sylius.context.customer').getCustomer().getId()", "expr:service('sylius.context.channel').getChannel().getId()", ]) - ->setDriverOption('class', $this->orderClass) ->orderBy('checkoutCompletedAt', 'desc') ->setLimits([10, 25, 50]) ->withFields( diff --git a/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php index 2f2e75a6a8..53d7ff5dd9 100644 --- a/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php +++ b/src/Sylius/Bundle/ShopBundle/Grid/ProductGrid.php @@ -20,14 +20,9 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter; use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface; use Sylius\Component\Grid\Attribute\AsGrid; -#[AsGrid(name: self::NAME)] +#[AsGrid(resourceClass: '%sylius.model.product.class%', name: self::NAME)] final class ProductGrid implements ProductGridInterface { - public function __construct( - private readonly string $productClass, - ) { - } - public function __invoke(GridBuilderInterface $gridBuilder): void { $gridBuilder @@ -38,7 +33,6 @@ final class ProductGrid implements ProductGridInterface 'sorting' => "expr:service('request_stack').getCurrentRequest().query.all('sorting')", 'includeAllDescendants' => "expr:parameter('sylius_shop.product_grid.include_all_descendants')", ]) - ->setDriverOption('class', $this->productClass) ->orderBy('position', 'asc') ->setLimits([ 9, diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php b/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php index fcef2557bc..6fc2ac57a6 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/grid.php @@ -17,18 +17,12 @@ return static function (ContainerConfigurator $container) { $services = $container->services(); $services->set('sylius_shop.grid.account.order', \Sylius\Bundle\ShopBundle\Grid\Account\OrderGrid::class) - ->args([ - '%sylius.model.order.class%', - ]) ->tag('sylius.invokable_grid') ; $services->alias(\Sylius\Bundle\ShopBundle\Grid\Account\OrderGridInterface::class, 'sylius_shop.grid.account.order'); $services->set('sylius_shop.grid.product', \Sylius\Bundle\ShopBundle\Grid\ProductGrid::class) - ->args([ - '%sylius.model.product.class%', - ]) ->tag('sylius.invokable_grid') ;