Merge pull request #829 from garak/fix-ci-cs

fix cs check in CI

Author: garak

.github/workflows/build.yaml

@@ -25,6 +25,8 @@ jobs:
               uses: actions/checkout@v4
             - name: Run PHP-CS-Fixer
               uses: docker://oskarstark/php-cs-fixer-ga
+              with:
+                args: --diff --dry-run
 
     twig-cs-fixer:
         runs-on: ubuntu-24.04

composer.json

@@ -28,8 +28,8 @@
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.11",
-        "phpunit/phpunit": "^10.5 || ^11.3",
+        "phpstan/phpstan": "^1.12",
+        "phpunit/phpunit": "^10.5 || ^11.5 || ^12.0",
         "symfony/expression-language": "^6.4 || ^7.0",
         "symfony/templating": "^6.4 || ^7.0"
     },

src/Twig/Extension/PaginationExtension.php

@@ -3,7 +3,6 @@
 namespace Knp\Bundle\PaginatorBundle\Twig\Extension;
 
 use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
 use Twig\TwigFunction;
 
 final class PaginationExtension extends AbstractExtension

src/Twig/Extension/PaginationRuntime.php

@@ -109,26 +109,26 @@ public function filter(
     }
 
     /**
-     * @param array<string, mixed>      $query
-     * @param int                       $page
-     * @param array<string, mixed>      $options
+     * @param array<string, mixed> $query
+     * @param array<string, mixed> $options
+     *
      * @return array<string, mixed>
      */
     public function getQueryParams(array $query, int $page, array $options = []): array
     {
         $pageName = $this->pageName;
-        if (isset($options['pageParameterName']) && is_string($options['pageParameterName'])) {
+        if (isset($options['pageParameterName']) && \is_string($options['pageParameterName'])) {
             $pageName = $options['pageParameterName'];
         }
 
-        if ($page === 1 && $this->skipFirstPageLink) {
+        if (1 === $page && $this->skipFirstPageLink) {
             if (isset($query[$pageName])) {
                 unset($query[$pageName]);
             }
 
             return $query;
         }
 
-        return array_merge($query, [$pageName => $page]);
+        return \array_merge($query, [$pageName => $page]);
     }
 }