Enable rule checkGenericClassInNonGenericObjectType in psalm

phpstan.neon

@@ -4,5 +4,3 @@ parameters:
 
     # The level 9 is the highest level
     level: 9
-
-    checkGenericClassInNonGenericObjectType: false

src/Utils/CategoryUtils.php

@@ -6,6 +6,7 @@
 
 namespace Basecom\FixturePlugin\Utils;
 
+use Shopware\Core\Content\Category\CategoryCollection;
 use Shopware\Core\Content\Category\CategoryEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
@@ -14,6 +15,9 @@
 
 readonly class CategoryUtils
 {
+    /**
+     * @param EntityRepository<CategoryCollection> $categoryRepository
+     */
     public function __construct(
         private EntityRepository $categoryRepository,
     ) {

src/Utils/CmsUtils.php

@@ -4,6 +4,7 @@
 
 namespace Basecom\FixturePlugin\Utils;
 
+use Shopware\Core\Content\Cms\CmsPageCollection;
 use Shopware\Core\Content\Cms\CmsPageEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
@@ -13,6 +14,9 @@
 
 readonly class CmsUtils
 {
+    /**
+     * @param EntityRepository<CmsPageCollection> $cmsPageRepository
+     */
     public function __construct(
         private EntityRepository $cmsPageRepository,
     ) {

src/Utils/CustomerUtils.php

@@ -8,10 +8,14 @@
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
+use Shopware\Core\System\Salutation\SalutationCollection;
 use Shopware\Core\System\Salutation\SalutationEntity;
 
 readonly class CustomerUtils
 {
+    /**
+     * @param EntityRepository<SalutationCollection> $salutationRepository
+     */
     public function __construct(
         private EntityRepository $salutationRepository,
     ) {

src/Utils/MediaUtils.php

@@ -4,16 +4,22 @@
 
 namespace Basecom\FixturePlugin\Utils;
 
+use Shopware\Core\Content\Media\Aggregate\MediaFolder\MediaFolderCollection;
 use Shopware\Core\Content\Media\Aggregate\MediaFolder\MediaFolderEntity;
 use Shopware\Core\Content\Media\File\FileFetcher;
 use Shopware\Core\Content\Media\File\FileSaver;
+use Shopware\Core\Content\Media\MediaCollection;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 
 readonly class MediaUtils
 {
+    /**
+     * @param EntityRepository<MediaCollection>       $mediaRepository
+     * @param EntityRepository<MediaFolderCollection> $mediaFolderRepository
+     */
     public function __construct(
         private EntityRepository $mediaRepository,
         private EntityRepository $mediaFolderRepository,

src/Utils/PaymentMethodUtils.php

@@ -5,6 +5,7 @@
 namespace Basecom\FixturePlugin\Utils;
 
 use Shopware\Core\Checkout\Payment\Cart\PaymentHandler\InvoicePayment;
+use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
 use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
@@ -13,6 +14,9 @@
 
 readonly class PaymentMethodUtils
 {
+    /**
+     * @param EntityRepository<PaymentMethodCollection> $paymentMethodRepository
+     */
     public function __construct(
         private EntityRepository $paymentMethodRepository,
     ) {

src/Utils/SalesChannelUtils.php

@@ -9,16 +9,32 @@
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
+use Shopware\Core\System\Country\CountryCollection;
 use Shopware\Core\System\Country\CountryEntity;
+use Shopware\Core\System\Currency\CurrencyCollection;
 use Shopware\Core\System\Currency\CurrencyEntity;
+use Shopware\Core\System\Language\LanguageCollection;
 use Shopware\Core\System\Language\LanguageEntity;
+use Shopware\Core\System\Locale\LocaleCollection;
 use Shopware\Core\System\Locale\LocaleEntity;
+use Shopware\Core\System\SalesChannel\SalesChannelCollection;
 use Shopware\Core\System\SalesChannel\SalesChannelEntity;
+use Shopware\Core\System\Snippet\Aggregate\SnippetSet\SnippetSetCollection;
 use Shopware\Core\System\Snippet\Aggregate\SnippetSet\SnippetSetEntity;
+use Shopware\Core\System\Tax\TaxCollection;
 use Shopware\Core\System\Tax\TaxEntity;
 
 readonly class SalesChannelUtils
 {
+    /**
+     * @param EntityRepository<SalesChannelCollection> $salesChannelRepository
+     * @param EntityRepository<SnippetSetCollection>   $snippetSetRepository
+     * @param EntityRepository<TaxCollection>          $taxRepository
+     * @param EntityRepository<CountryCollection>      $countryRepository
+     * @param EntityRepository<LanguageCollection>     $languageRepository
+     * @param EntityRepository<CurrencyCollection>     $currencyRepository
+     * @param EntityRepository<LocaleCollection>       $localeRepository
+     */
     public function __construct(
         private EntityRepository $salesChannelRepository,
         private EntityRepository $snippetSetRepository,

src/Utils/ShippingMethodUtils.php

@@ -4,6 +4,7 @@
 
 namespace Basecom\FixturePlugin\Utils;
 
+use Shopware\Core\Checkout\Shipping\ShippingMethodCollection;
 use Shopware\Core\Checkout\Shipping\ShippingMethodEntity;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
@@ -12,6 +13,9 @@
 
 readonly class ShippingMethodUtils
 {
+    /**
+     * @param EntityRepository<ShippingMethodCollection> $shippingMethodRepository
+     */
     public function __construct(
         private EntityRepository $shippingMethodRepository,
     ) {