Update phpstan to ^2.1

Signed-off-by: Anton Fedurtsya <[email protected]>

Author: Sieg

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Notices if sitemap directory does not exist
 
 ### Removed
-- PHP 8.1 support
+- PHP 8.0 support
 
 ## [v1.0.3] - Unreleased
 

composer.json

@@ -11,15 +11,15 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">8.2",
+        "php": ">8.1",
         "oxid-esales/oxideshop-ce": "*"
     },
     "conflict": {
         "oxid-esales/oxideshop-ce": "<7.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^11.5",
-        "phpstan/phpstan": "^1.8.10",
+        "phpstan/phpstan": "^2.1",
         "squizlabs/php_codesniffer": "3.*",
         "phpmd/phpmd": "^2.11",
         "mikey179/vfsstream": "~1.6.8",

src/ChangeFilter/Additional/AdditionalChangeFilter.php

@@ -74,6 +74,9 @@ public function getDisabledUrlIds(): array
         return $idsForRemoval;
     }
 
+    /**
+     * @return array<string, string>
+     */
     protected function getAdditionalSitemapUrlKeys(): array
     {
         $additionalUrlsList = $this->moduleSettings->getAdditionalSitemapUrls();

src/ChangeFilter/Shared/DatabaseChangeFilter.php

@@ -33,9 +33,13 @@ public function __construct(
         $this->connection = $connectionProvider->get();
     }
 
+    /**
+     * @param array<string, string|int|bool|null> $queryParameters
+     *
+     * @return Generator<ObjectUrl>
+     */
     public function queryAndFetchModelObjectUrl(string $query, array $queryParameters): Generator
     {
-        /** @var Result $result */
         $result = $this->connection->executeQuery(
             $query,
             $queryParameters
@@ -58,6 +62,9 @@ public function queryAndFetchModelObjectUrl(string $query, array $queryParameter
         }
     }
 
+    /**
+     * @return array<string, string|int|bool|null>
+     */
     protected function getQueryParameters(): array
     {
         return [
@@ -90,14 +97,18 @@ protected function getDisabledSitemapItemsSql(string $objectType, string $table)
             where s.object_type='{$objectType}' AND c.oxid is NULL";
     }
 
+    /**
+     * @return array<int>
+     */
     protected function queryAndFetchDisabledSitemapObjectUrlIds(string $objectType, string $modelTable): array
     {
-        /** @var Result $result */
         $result = $this->connection->executeQuery(
             $this->getDisabledSitemapItemsSql($objectType, $modelTable),
             $this->getQueryParameters()
         );
 
-        return $result->fetchFirstColumn();
+        /** @var array<int> $ids */
+        $ids = $result->fetchFirstColumn();
+        return $ids;
     }
 }

src/Events.php

@@ -22,8 +22,6 @@ final class Events
 {
     /**
      * Execute action on activate event
-     *
-     * @throws Exception
      */
     public static function onActivate(): void
     {
@@ -33,8 +31,6 @@ public static function onActivate(): void
 
     /**
      * Execute action on deactivate event
-     *
-     * @throws Exception
      */
     public static function onDeactivate(): void
     {

src/Integration/Command/UpdateAllTypesCommand.php

@@ -26,7 +26,7 @@ public function __construct(
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD)
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Integration/Service/FilterFactory.php

@@ -15,10 +15,11 @@
 
 class FilterFactory implements FilterFactoryInterface
 {
+    /** @var array<ChangeFilterInterface> */
     private array $filters = [];
 
     /**
-     * @param iterable<\FreshAdvance\Sitemap\Integration\Contract\ChangeFilterInterface> $filters
+     * @param iterable<ChangeFilterInterface|object> $filters
      */
     public function __construct(
         iterable $filters

src/Integration/Service/FilterFactoryInterface.php

@@ -13,5 +13,8 @@ interface FilterFactoryInterface
 {
     public function getFilter(string $objectType): ChangeFilterInterface;
 
+    /**
+     * @return array<ChangeFilterInterface>
+     */
     public function getFilters(): array;
 }

src/Settings/ModuleSettings.php

@@ -34,7 +34,7 @@ public function getSitemapInSourceDirectory(): string
 
     public function getAdditionalSitemapUrls(): array
     {
-        return $this->shopModuleSettings->getCollection(
+        return $this->shopModuleSettings->getCollection( // @phpstan-ignore return.type
             self::SETTING_ADDITIONAL_SITEMAP_URLS,
             Module::MODULE_ID
         );

src/Settings/ModuleSettingsInterface.php

@@ -11,5 +11,8 @@ interface ModuleSettingsInterface
 {
     public function getSitemapInSourceDirectory(): string;
 
+    /**
+     * @return array<string>
+     */
     public function getAdditionalSitemapUrls(): array;
 }

src/Sitemap/Command/GenerateSitemapCommand.php

@@ -23,7 +23,7 @@ public function __construct(
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD)
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Sitemap/Service/XmlGenerator.php

@@ -37,6 +37,9 @@ public function generateSitemapItem(SitemapUrlInterface $url): string
         return $this->wrap(implode("", $attributes), "sitemap");
     }
 
+    /**
+     * @param array<string,string> $tagAttributes
+     */
     protected function wrap(string $data, string $tag, array $tagAttributes = []): string
     {
         $attributes = '';

src/Url/DataTypeFactory/UrlTypeFactory.php

@@ -14,10 +14,11 @@
 
 class UrlTypeFactory implements UrlTypeFactoryInterface
 {
+    /** @var array<UrlTypeInterface> $configurations */
     protected array $configurations = [];
 
     /**
-     * @param iterable<UrlTypeInterface> $configurations
+     * @param iterable<UrlTypeInterface|object> $configurations
      * @throws \FreshAdvance\Sitemap\Url\Exception\UrlTypeFactorySetupException
      */
     public function __construct(

src/Url/Repository/UrlRepositoryInterface.php

@@ -23,5 +23,8 @@ public function getUrls(int $page, int $perPage): iterable;
 
     public function getUrlsCount(): int;
 
+    /**
+     * @param array<int> $ids
+     */
     public function deleteByIds(array $ids): void;
 }

tests/PhpStan/phpstan.neon

@@ -1,5 +1,7 @@
 parameters:
-    checkMissingIterableValueType: false
+    phpVersion:
+        min: 80100
+        max: 80400
     bootstrapFiles:
         - phpstan-bootstrap.php
     level: max