Merge branch '4.x' into 5.x

Author: mbabker

composer.json

@@ -17,10 +17,10 @@
         "dg/bypass-finals": "^1.9",
         "jackalope/jackalope-doctrine-dbal": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "2.1.17",
-        "phpstan/phpstan-phpunit": "2.0.6",
+        "phpstan/phpstan": "2.1.29",
+        "phpstan/phpstan-phpunit": "2.0.7",
         "phpunit/phpunit": "11.5.25",
-        "rector/rector": "2.1.0",
+        "rector/rector": "2.1.7",
         "ruflin/elastica": "^7.3 || ^8.0",
         "solarium/solarium": "^6.2",
         "symfony/cache": "^6.4 || ^7.2",

lib/Core/Pagerfanta.php

@@ -79,8 +79,6 @@ public function getAdapter(): AdapterInterface
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function setAllowOutOfRangePages(bool $allowOutOfRangePages): PagerfantaInterface
     {
@@ -96,8 +94,6 @@ public function getAllowOutOfRangePages(): bool
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function setNormalizeOutOfRangePages(bool $normalizeOutOfRangePages): PagerfantaInterface
     {
@@ -114,8 +110,6 @@ public function getNormalizeOutOfRangePages(): bool
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1MaxPerPageException if the page is less than 1
      */
     public function setMaxPerPage(int $maxPerPage): PagerfantaInterface
@@ -163,8 +157,6 @@ public function getMaxPerPage(): int
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1CurrentPageException  if the current page is less than 1
      * @throws OutOfRangeCurrentPageException if It is not allowed out of range pages and they are not normalized
      */
@@ -337,8 +329,6 @@ private function minimumNbPages(): int
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1MaxPagesException if the max number of pages is less than 1
      */
     public function setMaxNbPages(int $maxNbPages): PagerfantaInterface
@@ -354,8 +344,6 @@ public function setMaxNbPages(int $maxNbPages): PagerfantaInterface
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function resetMaxNbPages(): PagerfantaInterface
     {

lib/Core/PagerfantaInterface.php

@@ -23,17 +23,13 @@ public function getAdapter(): AdapterInterface;
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function setAllowOutOfRangePages(bool $allowOutOfRangePages): self;
 
     public function getAllowOutOfRangePages(): bool;
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function setNormalizeOutOfRangePages(bool $normalizeOutOfRangePages): self;
 
@@ -42,8 +38,6 @@ public function getNormalizeOutOfRangePages(): bool;
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1MaxPerPageException if the page is less than 1
      */
     public function setMaxPerPage(int $maxPerPage): self;
@@ -56,8 +50,6 @@ public function getMaxPerPage(): int;
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1CurrentPageException  if the current page is less than 1
      * @throws OutOfRangeCurrentPageException if It is not allowed out of range pages and they are not normalized
      */
@@ -96,16 +88,12 @@ public function getNbPages(): int;
     /**
      * @return $this
      *
-     * @phpstan-self-out self<T>
-     *
      * @throws LessThan1MaxPagesException if the max number of pages is less than 1
      */
     public function setMaxNbPages(int $maxNbPages): self;
 
     /**
      * @return $this
-     *
-     * @phpstan-self-out self<T>
      */
     public function resetMaxNbPages(): self;