Fix tests

maximehuran · maximehuran · commit 97e76d4c7401 · 2024-09-06T15:13:20.000+02:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -17,9 +17,5 @@ parameters:
         - 'src/Menu/CaseStudyListUrlProvider.php'
 
     ignoreErrors:
-        # Replace checkMissingIterableValueType parameter to avoid deprecated warning
-        -
-            identifier: missingType.iterableValue
-        # Replace checkGenericClassInNonGenericObjectType parameter to avoid deprecated warning
-        #-
-        #    identifier: missingType.generics
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
diff --git a/src/Entity/Tag.php b/src/Entity/Tag.php
@@ -35,9 +35,6 @@ class Tag implements TagInterface
 
     protected ?int $position = null;
 
-    /**
-     * @var Collection<array-key, ArticleInterface>
-     */
     protected Collection $articles;
 
     public function __construct()
diff --git a/src/Entity/TagInterface.php b/src/Entity/TagInterface.php
@@ -33,8 +33,5 @@ public function removeArticle(ArticleInterface $article): void;
 
     public function hasArticle(ArticleInterface $article): bool;
 
-    /**
-     * @return Collection<array-key, ArticleInterface>
-     */
     public function getArticles(): Collection;
 }
diff --git a/src/Factory/ArticleFactory.php b/src/Factory/ArticleFactory.php
@@ -16,15 +16,9 @@
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
 use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
 
-/**
- * @implements ArticleFactoryInterface<ArticleInterface>
- */
 #[AsDecorator(decorates: 'monsieurbiz_blog.factory.article')]
 final class ArticleFactory implements ArticleFactoryInterface
 {
-    /**
-     * @param FactoryInterface<ArticleInterface> $originalArticleFactory
-     */
     public function __construct(
         #[AutowireDecorated]
         private readonly FactoryInterface $originalArticleFactory
@@ -33,6 +27,7 @@ public function __construct(
 
     public function createNew(): ArticleInterface
     {
+        /** @var ArticleInterface */
         return $this->originalArticleFactory->createNew();
     }
 
diff --git a/src/Factory/ArticleFactoryInterface.php b/src/Factory/ArticleFactoryInterface.php
@@ -14,11 +14,6 @@
 use MonsieurBiz\SyliusBlogPlugin\Entity\ArticleInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 
-/**
- * @template T of ArticleInterface
- *
- * @extends FactoryInterface<T>
- */
 interface ArticleFactoryInterface extends FactoryInterface
 {
     public function createNewWithType(string $type): ArticleInterface;
diff --git a/src/Fixture/Factory/ArticleFixtureFactory.php b/src/Fixture/Factory/ArticleFixtureFactory.php
@@ -18,8 +18,6 @@
 use Faker\Generator;
 use MonsieurBiz\SyliusBlogPlugin\Entity\ArticleInterface;
 use MonsieurBiz\SyliusBlogPlugin\Entity\ArticleTranslationInterface;
-use MonsieurBiz\SyliusBlogPlugin\Entity\AuthorInterface;
-use MonsieurBiz\SyliusBlogPlugin\Entity\TagInterface;
 use MonsieurBiz\SyliusBlogPlugin\Repository\TagRepositoryInterface;
 use MonsieurBiz\SyliusMediaManagerPlugin\Exception\CannotReadCurrentFolderException;
 use MonsieurBiz\SyliusMediaManagerPlugin\Helper\FileHelperInterface;
@@ -48,13 +46,6 @@ final class ArticleFixtureFactory extends AbstractExampleFactory
 
     /**
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     *
-     * @param FactoryInterface<ArticleInterface> $articleFactory
-     * @param FactoryInterface<ArticleTranslationInterface> $articleTranslationFactory
-     * @param TagRepositoryInterface<TagInterface> $tagRepository
-     * @param RepositoryInterface<LocaleInterface> $localeRepository
-     * @param ChannelRepositoryInterface<ChannelInterface> $channelRepository
-     * @param RepositoryInterface<AuthorInterface> $authorRepository
      */
     public function __construct(
         private FactoryInterface $articleFactory,
diff --git a/src/Fixture/Factory/AuthorFixtureFactory.php b/src/Fixture/Factory/AuthorFixtureFactory.php
@@ -31,9 +31,6 @@ final class AuthorFixtureFactory extends AbstractExampleFactory
 
     private Generator $faker;
 
-    /**
-     * @param FactoryInterface<AuthorInterface> $authorFactory
-     */
     public function __construct(
         private FactoryInterface $authorFactory,
         private FileLocatorInterface $fileLocator,
diff --git a/src/Fixture/Factory/TagFixtureFactory.php b/src/Fixture/Factory/TagFixtureFactory.php
@@ -31,11 +31,6 @@ final class TagFixtureFactory extends AbstractExampleFactory
 
     private Generator $faker;
 
-    /**
-     * @param FactoryInterface<TagInterface> $tagFactory
-     * @param FactoryInterface<TagTranslationInterface> $tagTranslationFactory
-     * @param RepositoryInterface<LocaleInterface> $localeRepository
-     */
     public function __construct(
         private FactoryInterface $tagFactory,
         private FactoryInterface $tagTranslationFactory,
diff --git a/src/Form/Type/ArticleType.php b/src/Form/Type/ArticleType.php
@@ -11,7 +11,6 @@
 
 namespace MonsieurBiz\SyliusBlogPlugin\Form\Type;
 
-use MonsieurBiz\SyliusBlogPlugin\Entity\AuthorInterface;
 use MonsieurBiz\SyliusBlogPlugin\Entity\Tag;
 use MonsieurBiz\SyliusBlogPlugin\Entity\TagInterface;
 use MonsieurBiz\SyliusBlogPlugin\Repository\AuthorRepositoryInterface;
@@ -30,9 +29,6 @@
 
 final class ArticleType extends AbstractResourceType
 {
-    /**
-     * @param AuthorRepositoryInterface<AuthorInterface> $authorRepository
-     */
     public function __construct(
         private LocaleContextInterface $localeContext,
         private AuthorRepositoryInterface $authorRepository,
diff --git a/src/Form/Type/CaseStudyElementType.php b/src/Form/Type/CaseStudyElementType.php
@@ -26,7 +26,6 @@
 
 final class CaseStudyElementType extends AbstractType
 {
-    /** @phpstan-ignore-next-line */
     public function __construct(
         private ArticleRepositoryInterface $articleRepository,
         private ChannelContextInterface $channelContext,
diff --git a/src/Repository/ArticleRepository.php b/src/Repository/ArticleRepository.php
@@ -18,11 +18,6 @@
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Channel\Model\ChannelInterface;
 
-/**
- * @template T of ArticleInterface
- *
- * @implements ArticleRepositoryInterface<T>
- */
 final class ArticleRepository extends EntityRepository implements ArticleRepositoryInterface
 {
     public function createListQueryBuilderByType(string $localeCode, string $type): QueryBuilder
diff --git a/src/Repository/ArticleRepositoryInterface.php b/src/Repository/ArticleRepositoryInterface.php
@@ -18,11 +18,6 @@
 use Sylius\Component\Channel\Model\ChannelInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
-/**
- * @template T of ArticleInterface
- *
- * @extends RepositoryInterface<T>
- */
 interface ArticleRepositoryInterface extends RepositoryInterface
 {
     public function createListQueryBuilderByType(string $localeCode, string $type): QueryBuilder;
diff --git a/src/Repository/AuthorRepository.php b/src/Repository/AuthorRepository.php
@@ -12,14 +12,8 @@
 namespace MonsieurBiz\SyliusBlogPlugin\Repository;
 
 use Doctrine\ORM\QueryBuilder;
-use MonsieurBiz\SyliusBlogPlugin\Entity\AuthorInterface;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 
-/**
- * @template T of AuthorInterface
- *
- * @implements AuthorRepositoryInterface<T>
- */
 final class AuthorRepository extends EntityRepository implements AuthorRepositoryInterface
 {
     public function createListQueryBuilder(): QueryBuilder
diff --git a/src/Repository/AuthorRepositoryInterface.php b/src/Repository/AuthorRepositoryInterface.php
@@ -12,14 +12,8 @@
 namespace MonsieurBiz\SyliusBlogPlugin\Repository;
 
 use Doctrine\ORM\QueryBuilder;
-use MonsieurBiz\SyliusBlogPlugin\Entity\AuthorInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
-/**
- * @template T of AuthorInterface
- *
- * @extends RepositoryInterface<T>
- */
 interface AuthorRepositoryInterface extends RepositoryInterface
 {
     public function createListQueryBuilder(): QueryBuilder;
diff --git a/src/Repository/TagRepository.php b/src/Repository/TagRepository.php
@@ -17,11 +17,6 @@
 use MonsieurBiz\SyliusBlogPlugin\Entity\TagInterface;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 
-/**
- * @template T of TagInterface
- *
- * @implements TagRepositoryInterface<T>
- */
 final class TagRepository extends EntityRepository implements TagRepositoryInterface
 {
     public function findRootNodes(): array
diff --git a/src/Repository/TagRepositoryInterface.php b/src/Repository/TagRepositoryInterface.php
@@ -15,11 +15,6 @@
 use MonsieurBiz\SyliusBlogPlugin\Entity\TagInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
-/**
- * @template T of TagInterface
- *
- * @extends RepositoryInterface<T>
- */
 interface TagRepositoryInterface extends RepositoryInterface
 {
     /**
diff --git a/src/Twig/BlogExtension.php b/src/Twig/BlogExtension.php
@@ -19,7 +19,6 @@
 
 final class BlogExtension extends AbstractExtension
 {
-    /** @phpstan-ignore-next-line */
     public function __construct(
         private TagRepositoryInterface $tagRepository,
         private LocaleContextInterface $localeContext,
diff --git a/src/UiElement/CaseStudiesUiElement.php b/src/UiElement/CaseStudiesUiElement.php
@@ -22,7 +22,6 @@ final class CaseStudiesUiElement implements UiElementInterface
 {
     use UiElementTrait;
 
-    /** @phpstan-ignore-next-line */
     public function __construct(
         private ArticleRepositoryInterface $articleRepository,
         private LocaleContextInterface $localeContext,

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,5 @@ public function removeArticle(ArticleInterface $article): void;`
`33`	`33`
`34`	`34`	`public function hasArticle(ArticleInterface $article): bool;`
`35`	`35`
`36`		`- /**`
`37`		`- * @return Collection<array-key, ArticleInterface>`
`38`		`- */`
`39`	`36`	`public function getArticles(): Collection;`
`40`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`final class CaseStudyElementType extends AbstractType`
`28`	`28`	`{`
`29`		`- /** @phpstan-ignore-next-line */`
`30`	`29`	`public function __construct(`
`31`	`30`	`private ArticleRepositoryInterface $articleRepository,`
`32`	`31`	`private ChannelContextInterface $channelContext,`