Skip to content

Make fixture factory constructor arguments protected #18050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

Make fixture factory constructor arguments protected #18050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/AddressExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@

class AddressExampleFactory extends AbstractExampleFactory
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<AddressInterface> $addressFactory
* @param RepositoryInterface<CountryInterface> $countryRepository
* @param RepositoryInterface<CustomerInterface> $customerRepository
*/
public function __construct(
private FactoryInterface $addressFactory,
private RepositoryInterface $countryRepository,
private RepositoryInterface $customerRepository,
protected readonly FactoryInterface $addressFactory,
protected readonly RepositoryInterface $countryRepository,
protected readonly RepositoryInterface $customerRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
14 changes: 7 additions & 7 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/AdminUserExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@

class AdminUserExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<AdminUserInterface> $userFactory
* @param FactoryInterface<ImageInterface> $avatarImageFactory
*/
public function __construct(
private FactoryInterface $userFactory,
private string $localeCode,
private FileLocatorInterface $fileLocator,
private ImageUploaderInterface $imageUploader,
private FactoryInterface $avatarImageFactory,
protected readonly FactoryInterface $userFactory,
protected readonly string $localeCode,
protected readonly FileLocatorInterface $fileLocator,
protected readonly ImageUploaderInterface $imageUploader,
protected readonly FactoryInterface $avatarImageFactory,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/CatalogPromotionActionExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

final class CatalogPromotionActionExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/** @param FactoryInterface<CatalogPromotionActionInterface> $catalogPromotionActionFactory */
public function __construct(private FactoryInterface $catalogPromotionActionFactory)
public function __construct(protected readonly FactoryInterface $catalogPromotionActionFactory)
{
$this->optionsResolver = new OptionsResolver();

Expand Down
14 changes: 7 additions & 7 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/CatalogPromotionExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@

class CatalogPromotionExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<CatalogPromotionInterface> $catalogPromotionFactory
* @param RepositoryInterface<LocaleInterface> $localeRepository
*/
public function __construct(
private FactoryInterface $catalogPromotionFactory,
private RepositoryInterface $localeRepository,
private ChannelRepositoryInterface $channelRepository,
private ExampleFactoryInterface $catalogPromotionScopeExampleFactory,
private ExampleFactoryInterface $catalogPromotionActionExampleFactory,
protected readonly FactoryInterface $catalogPromotionFactory,
protected readonly RepositoryInterface $localeRepository,
protected readonly ChannelRepositoryInterface $channelRepository,
protected readonly ExampleFactoryInterface $catalogPromotionScopeExampleFactory,
protected readonly ExampleFactoryInterface $catalogPromotionActionExampleFactory,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/CatalogPromotionScopeExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

final class CatalogPromotionScopeExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/** @param FactoryInterface<CatalogPromotionScopeInterface> $catalogPromotionScopeFactory */
public function __construct(private FactoryInterface $catalogPromotionScopeFactory)
public function __construct(protected readonly FactoryInterface $catalogPromotionScopeFactory)
{
$this->optionsResolver = new OptionsResolver();

Expand Down
16 changes: 8 additions & 8 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param RepositoryInterface<LocaleInterface> $localeRepository
Expand All @@ -45,12 +45,12 @@ class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFac
* @param FactoryInterface<ShopBillingDataInterface> $shopBillingDataFactory
*/
public function __construct(
private ChannelFactoryInterface $channelFactory,
private RepositoryInterface $localeRepository,
private RepositoryInterface $currencyRepository,
private RepositoryInterface $zoneRepository,
private TaxonRepositoryInterface $taxonRepository,
private FactoryInterface $shopBillingDataFactory,
protected readonly ChannelFactoryInterface $channelFactory,
protected readonly RepositoryInterface $localeRepository,
protected readonly RepositoryInterface $currencyRepository,
protected readonly RepositoryInterface $zoneRepository,
protected readonly TaxonRepositoryInterface $taxonRepository,
protected readonly FactoryInterface $shopBillingDataFactory,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/CustomerGroupExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

class CustomerGroupExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/** @param FactoryInterface<CustomerGroupInterface> $customerGroupFactory */
public function __construct(private FactoryInterface $customerGroupFactory)
public function __construct(protected readonly FactoryInterface $customerGroupFactory)
{
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/PaymentMethodExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ class PaymentMethodExampleFactory extends AbstractExampleFactory
{
public const DEFAULT_LOCALE = 'en_US';

private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/** @param RepositoryInterface<LocaleInterface> $localeRepository */
public function __construct(
private PaymentMethodFactoryInterface $paymentMethodFactory,
private RepositoryInterface $localeRepository,
private ChannelRepositoryInterface $channelRepository,
protected readonly PaymentMethodFactoryInterface $paymentMethodFactory,
protected readonly RepositoryInterface $localeRepository,
protected readonly ChannelRepositoryInterface $channelRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductAssociationExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

class ProductAssociationExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/** @param FactoryInterface<ProductAssociationInterface> $productAssociationFactory */
public function __construct(
private FactoryInterface $productAssociationFactory,
private ProductAssociationTypeRepositoryInterface $productAssociationTypeRepository,
private ProductRepositoryInterface $productRepository,
protected readonly FactoryInterface $productAssociationFactory,
protected readonly ProductAssociationTypeRepositoryInterface $productAssociationTypeRepository,
protected readonly ProductRepositoryInterface $productRepository,
) {
$this->optionsResolver = new OptionsResolver();

Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductAssociationTypeExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@

class ProductAssociationTypeExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<ProductAssociationTypeInterface> $productAssociationTypeFactory
* @param RepositoryInterface<LocaleInterface> $localeRepository
*/
public function __construct(
private FactoryInterface $productAssociationTypeFactory,
private RepositoryInterface $localeRepository,
protected readonly FactoryInterface $productAssociationTypeFactory,
protected readonly RepositoryInterface $localeRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductAttributeExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@

class ProductAttributeExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param RepositoryInterface<LocaleInterface> $localeRepository
* @param array<string, string> $attributeTypes
*/
public function __construct(
private AttributeFactoryInterface $productAttributeFactory,
private RepositoryInterface $localeRepository,
private array $attributeTypes,
protected readonly AttributeFactoryInterface $productAttributeFactory,
protected readonly RepositoryInterface $localeRepository,
protected readonly array $attributeTypes,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
36 changes: 18 additions & 18 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@

class ProductExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<ProductInterface> $productFactory
Expand All @@ -66,22 +66,22 @@ class ProductExampleFactory extends AbstractExampleFactory implements ExampleFac
* @param RepositoryInterface<TaxCategoryInterface> $taxCategoryRepository
*/
public function __construct(
private FactoryInterface $productFactory,
private FactoryInterface $productVariantFactory,
private FactoryInterface $channelPricingFactory,
private ProductVariantGeneratorInterface $variantGenerator,
private FactoryInterface $productAttributeValueFactory,
private FactoryInterface $productImageFactory,
private FactoryInterface $productTaxonFactory,
private ImageUploaderInterface $imageUploader,
private SlugGeneratorInterface $slugGenerator,
private RepositoryInterface $taxonRepository,
private RepositoryInterface $productAttributeRepository,
private RepositoryInterface $productOptionRepository,
private RepositoryInterface $channelRepository,
private RepositoryInterface $localeRepository,
private RepositoryInterface $taxCategoryRepository,
private FileLocatorInterface $fileLocator,
protected readonly FactoryInterface $productFactory,
protected readonly FactoryInterface $productVariantFactory,
protected readonly FactoryInterface $channelPricingFactory,
protected readonly ProductVariantGeneratorInterface $variantGenerator,
protected readonly FactoryInterface $productAttributeValueFactory,
protected readonly FactoryInterface $productImageFactory,
protected readonly FactoryInterface $productTaxonFactory,
protected readonly ImageUploaderInterface $imageUploader,
protected readonly SlugGeneratorInterface $slugGenerator,
protected readonly RepositoryInterface $taxonRepository,
protected readonly RepositoryInterface $productAttributeRepository,
protected readonly RepositoryInterface $productOptionRepository,
protected readonly RepositoryInterface $channelRepository,
protected readonly RepositoryInterface $localeRepository,
protected readonly RepositoryInterface $taxCategoryRepository,
protected readonly FileLocatorInterface $fileLocator,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductOptionExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@

class ProductOptionExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<ProductOptionInterface> $productOptionFactory
* @param FactoryInterface<ProductOptionValueInterface> $productOptionValueFactory
* @param RepositoryInterface<LocaleInterface> $localeRepository
*/
public function __construct(
private FactoryInterface $productOptionFactory,
private FactoryInterface $productOptionValueFactory,
private RepositoryInterface $localeRepository,
protected readonly FactoryInterface $productOptionFactory,
protected readonly FactoryInterface $productOptionValueFactory,
protected readonly RepositoryInterface $localeRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
12 changes: 6 additions & 6 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductReviewExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@

class ProductReviewExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

public function __construct(
private ReviewFactoryInterface $productReviewFactory,
private ProductRepositoryInterface $productRepository,
private CustomerRepositoryInterface $customerRepository,
private StateMachineInterface $stateMachine,
protected readonly ReviewFactoryInterface $productReviewFactory,
protected readonly ProductRepositoryInterface $productRepository,
protected readonly CustomerRepositoryInterface $customerRepository,
protected readonly StateMachineInterface $stateMachine,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
7 changes: 4 additions & 3 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionActionExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@

class PromotionActionExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

public function __construct(private PromotionActionFactoryInterface $promotionActionFactory)
/** @param PromotionActionFactoryInterface<PromotionActionInterface> $promotionActionFactory */
public function __construct(protected readonly PromotionActionFactoryInterface $promotionActionFactory)
{
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
16 changes: 8 additions & 8 deletions src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionExampleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@

class PromotionExampleFactory extends AbstractExampleFactory implements ExampleFactoryInterface
{
private Generator $faker;
protected Generator $faker;

private OptionsResolver $optionsResolver;
protected OptionsResolver $optionsResolver;

/**
* @param FactoryInterface<PromotionInterface> $promotionFactory
* @param FactoryInterface<PromotionCouponInterface> $couponFactory
* @param RepositoryInterface<LocaleInterface> $localeRepository
*/
public function __construct(
private FactoryInterface $promotionFactory,
private ExampleFactoryInterface $promotionRuleExampleFactory,
private ExampleFactoryInterface $promotionActionExampleFactory,
private ChannelRepositoryInterface $channelRepository,
private FactoryInterface $couponFactory,
private RepositoryInterface $localeRepository,
protected readonly FactoryInterface $promotionFactory,
protected readonly ExampleFactoryInterface $promotionRuleExampleFactory,
protected readonly ExampleFactoryInterface $promotionActionExampleFactory,
protected readonly ChannelRepositoryInterface $channelRepository,
protected readonly FactoryInterface $couponFactory,
protected readonly RepositoryInterface $localeRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
Expand Down
Loading
Loading