fix: phpstan errors

Author: delyriand

Makefile

@@ -114,7 +114,7 @@ test.composer: ## Validate composer.json
 	${COMPOSER} validate --strict
 
 test.phpstan: ## Run PHPStan
-	${COMPOSER} phpstan || true
+	${COMPOSER} phpstan
 
 test.phpmd: ## Run PHPMD
 	${COMPOSER} phpmd || true

phpstan.neon

@@ -4,6 +4,7 @@ parameters:
         - %rootDir%/src/
 
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
 
     excludes_analyse:
         # Makes PHPStan crash
@@ -12,6 +13,6 @@ parameters:
 
         # Test dependencies
         - 'tests/Application/**/*'
-        
+
         # Generated files
         - 'generated/**/*'

src/AutoMapper/ProductAttributeValueConfiguration.php

@@ -57,6 +57,7 @@ public function process(MapperGeneratorMetadataInterface $metadata): void
                 return null;
             }
             if (!\array_key_exists($productAttributeValue->getType(), $this->productAttributeValueReaders)) {
+                // @phpstan-ignore-next-line The logger can't be null here
                 $this->logger->alert(sprintf('Missing product attribute value reader for "%s" type', $productAttributeValue->getType()));
 
                 return null;

src/Controller/SearchController.php

@@ -71,7 +71,8 @@ public function searchAction(
         Request $request,
         string $query
     ): Response {
-        $documentable = $this->getDocumentable($request->query->get('document_type', null));
+        $documentType = ((string) $request->query->get('document_type')) ?: null;
+        $documentable = $this->getDocumentable($documentType);
         $requestConfiguration = new RequestConfiguration(
             $request,
             RequestInterface::SEARCH_TYPE,
@@ -171,6 +172,7 @@ private function getDocumentable(?string $documentType): DocumentableInterface
         }
 
         try {
+            /** @phpstan-ignore-next-line */
             return $this->documentableRegistry->get('search.documentable.' . $documentType);
         } catch (NonExistingServiceException $exception) {
             throw new NotFoundHttpException(sprintf('Documentable "%s" not found', $documentType));

src/Fixture/SearchableFixture.php

@@ -43,6 +43,7 @@ public function getName(): string
      */
     protected function configureResourceNode(ArrayNodeDefinition $resourceNode): void
     {
+        /** @phpstan-ignore-next-line */
         $resourceNode
             ->children()
             ->scalarNode('attribute')->end()

src/Model/Datasource/ProductDatasource.php

@@ -14,6 +14,7 @@
 namespace MonsieurBiz\SyliusSearchPlugin\Model\Datasource;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 use Pagerfanta\Doctrine\ORM\QueryAdapter;
 use Pagerfanta\Pagerfanta;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
@@ -30,8 +31,9 @@ public function __construct(EntityManagerInterface $entityManager)
 
     public function getItems(string $sourceClass): iterable
     {
+        /** @phpstan-ignore-next-line */
         $repository = $this->entityManager->getRepository($sourceClass);
-        /** @var ProductRepositoryInterface $repository */
+        /** @var ProductRepositoryInterface&EntityRepository $repository */
         Assert::isInstanceOf($repository, ProductRepositoryInterface::class);
 
         $queryBuilder = $repository->createQueryBuilder('o')

src/Search/Request/InstantSearch.php

@@ -58,7 +58,7 @@ public function getType(): string
 
     public function getDocumentable(): DocumentableInterface
     {
-        /** @var DocumentableInterface $documentable */
+        /** @phpstan-ignore-next-line  */
         return $this->documentableRegistry->get('search.documentable.' . $this->documentType);
     }
 

src/Search/Request/Search.php

@@ -77,7 +77,7 @@ public function getType(): string
 
     public function getDocumentable(): DocumentableInterface
     {
-        /** @var DocumentableInterface $documentable */
+        /** @phpstan-ignore-next-line  */
         return $this->documentableRegistry->get('search.documentable.' . $this->documentType);
     }
 

src/Search/Request/Taxon.php

@@ -20,6 +20,7 @@
 use MonsieurBiz\SyliusSearchPlugin\Search\Request\PostFilter\PostFilterInterface;
 use MonsieurBiz\SyliusSearchPlugin\Search\Request\QueryFilter\QueryFilterInterface;
 use MonsieurBiz\SyliusSearchPlugin\Search\Request\Sorting\SorterInterface;
+use RuntimeException;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Registry\ServiceRegistryInterface;
 
@@ -82,30 +83,34 @@ public function getType(): string
 
     public function getDocumentable(): DocumentableInterface
     {
-        /** @var DocumentableInterface $documentable */
+        /** @phpstan-ignore-next-line  */
         return $this->documentableRegistry->get('search.documentable.' . $this->documentType);
     }
 
     public function getQuery(): Query
     {
+        if (!($configuration = $this->configuration)) {
+            throw new RuntimeException('Configuration is not set');
+        }
+
         $qb = new QueryBuilder();
 
         $boolQuery = $qb->query()->bool();
         foreach ($this->queryFilters as $queryFilter) {
-            $queryFilter->apply($boolQuery, $this->configuration);
+            $queryFilter->apply($boolQuery, $configuration);
         }
 
         $query = Query::create($boolQuery);
         $postFilter = new Query\BoolQuery();
         foreach ($this->postFilters as $postFilterApplier) {
-            $postFilterApplier->apply($postFilter, $this->configuration);
+            $postFilterApplier->apply($postFilter, $configuration);
         }
         $query->setPostFilter($postFilter);
 
         $this->addAggregations($query, $postFilter);
 
         foreach ($this->sorters as $sorter) {
-            $sorter->apply($query, $this->configuration);
+            $sorter->apply($query, $configuration);
         }
 
         /** @var Query\AbstractQuery $queryObject */
@@ -116,7 +121,7 @@ public function getQuery(): Query
             ->setScoreMode(Query\FunctionScore::SCORE_MODE_MULTIPLY)
         ;
         foreach ($this->functionScores as $functionScoreClass) {
-            $functionScoreClass->addFunctionScore($functionScore, $this->configuration);
+            $functionScoreClass->addFunctionScore($functionScore, $configuration);
         }
 
         $query->setQuery($functionScore);