Update PHP minimum version to 8.0 and dependencies to latest compatible version

Author: nguereza-tony

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macOS-latest]
-        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
     - name: Checkout
@@ -28,7 +28,7 @@ jobs:
       run: php -v
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

.scrutinizer.yml

@@ -11,7 +11,7 @@ build:
                         command: phpcs-run
                         use_website_config: false
     environment:
-        php: 7.4.0
+        php: 8.0
 filter:
     excluded_paths:
         - 'tests/*'

README.MD

@@ -12,7 +12,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/c60bca19b93347159cfd771a8dc9de7e)](https://app.codacy.com/gh/platine-php/pagination/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
 
 ### Requirements 
-- **PHP >= 7.4**, **PHP 8** 
+- **PHP >= 8.0**
 
 ### Installation
 #### Using composer (recommended)

composer.json

@@ -19,14 +19,14 @@
     },
 
     "require": {
-        "php": "^7.4 || ^8"
+        "php": "^8"
     },
 
     "require-dev": {
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^1.8",
-        "phpunit/phpunit": "^9.5",
-        "platine-php/dev": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "phpunit/phpunit": "^9.6",
+        "platine-php/dev": "^2.0",
         "squizlabs/php_codesniffer": "3.*"
     },
 

src/Page.php

@@ -48,7 +48,7 @@
 namespace Platine\Pagination;
 
 /**
- * Class Page
+ * @class Page
  * @package Platine\Pagination
  */
 class Page
@@ -57,7 +57,7 @@ class Page
      * The page number
      * @var int|string
      */
-    protected $number;
+    protected int|string $number;
 
     /**
      * The page URL
@@ -77,7 +77,7 @@ class Page
      * @param string|null $url
      * @param bool $current
      */
-    public function __construct($number, ?string $url, bool $current = false)
+    public function __construct(int|string $number, ?string $url, bool $current = false)
     {
         $this->number = $number;
         $this->url = $url;
@@ -88,7 +88,7 @@ public function __construct($number, ?string $url, bool $current = false)
      * Return the page number
      * @return int|string
      */
-    public function getNumber()
+    public function getNumber(): int|string
     {
         return $this->number;
     }

src/Pagination.php

@@ -50,12 +50,13 @@
 use InvalidArgumentException;
 use Platine\Pagination\Renderer\DefaultRenderer;
 use Platine\Pagination\UrlGenerator\SimpleUrlGenerator;
+use Stringable;
 
 /**
- * Class Pagination
+ * @class Pagination
  * @package Platine\Pagination
  */
-class Pagination
+class Pagination implements Stringable
 {
     /**
      * The URL generator instance
@@ -120,13 +121,8 @@ public function __construct(
         ?UrlGeneratorInterface $urlGenerator = null,
         ?RendererInterface $renderer = null
     ) {
-        $this->urlGenerator = $urlGenerator
-                               ? $urlGenerator
-                               : new SimpleUrlGenerator();
-
-        $this->renderer = $renderer
-                            ? $renderer
-                            : new DefaultRenderer();
+        $this->urlGenerator = $urlGenerator ?? new SimpleUrlGenerator();
+        $this->renderer = $renderer ?? new DefaultRenderer();
 
         $this->updateTotalPages();
     }
@@ -160,7 +156,7 @@ public function getNextPage(): ?int
     public function getNextUrl(): ?string
     {
         if ($this->hasNextPage()) {
-            return $this->getPageUrl($this->getNextPage());
+            return $this->getPageUrl((int) $this->getNextPage());
         }
 
         return null;
@@ -195,7 +191,7 @@ public function getPreviousPage(): ?int
     public function getPreviousUrl(): ?string
     {
         if ($this->hasPreviousPage()) {
-            return $this->getPageUrl($this->getPreviousPage());
+            return $this->getPageUrl((int) $this->getPreviousPage());
         }
 
         return null;
@@ -412,7 +408,7 @@ public function getMaxPages(): int
     /**
      * Return the pages links data
      *
-     * @return array<Page>
+     * @return Page[]
      */
     public function getPages(): array
     {

src/Renderer/DefaultRenderer.php

@@ -47,11 +47,12 @@
 
 namespace Platine\Pagination\Renderer;
 
+use Platine\Pagination\Page;
 use Platine\Pagination\Pagination;
 use Platine\Pagination\RendererInterface;
 
 /**
- * Class DefaultRenderer
+ * @class DefaultRenderer
  * @package Platine\Pagination\Renderer
  */
 class DefaultRenderer implements RendererInterface
@@ -68,27 +69,38 @@ public function render(Pagination $pagination): string
         $html = '<ul class = "pagination">';
 
         if ($pagination->hasPreviousPage()) {
-            $html .= '<li><a href = "' . $pagination->getPreviousUrl() . '">&laquo; '
-                    . $pagination->getPreviousText() . '</a></li>';
+            $html .= sprintf(
+                '<li><a href = "%s">&laquo; %s</a></li>',
+                $pagination->getPreviousUrl(),
+                $pagination->getPreviousText()
+            );
         }
 
-        /** @var array<\Platine\Pagination\Page> $pages */
+        /** @var Page[] $pages */
         $pages = $pagination->getPages();
 
         foreach ($pages as $page) {
             if ($page->getUrl() !== null) {
-                $html .= '<li' . ($page->isCurrent() ? ' class = "active"' : '')
-                      . '><a href = "' . $page->getUrl() . '">'
-                      . $page->getNumber() . '</a></li>';
+                $html .= sprintf(
+                    '<li%s><a href = "%s">%d</a></li>',
+                    $page->isCurrent() ? ' class = "active"' : '',
+                    $page->getUrl(),
+                    $page->getNumber()
+                );
             } else {
-                $html .= '<li class = "disabled"><span>'
-                        . $page->getNumber() . '</span></li>';
+                $html .= sprintf(
+                    '<li class = "disabled"><span>%s</span></li>',
+                    $page->getNumber()
+                );
             }
         }
 
         if ($pagination->hasNextPage()) {
-            $html .= '<li><a href = "' . $pagination->getNextUrl() . '">'
-                    . $pagination->getNextText() . ' &raquo;</a></li>';
+            $html .= sprintf(
+                '<li><a href = "%s">%s &raquo;</a></li>',
+                $pagination->getNextUrl(),
+                $pagination->getNextText()
+            );
         }
 
         $html .= '</ul>';

src/RendererInterface.php

@@ -48,7 +48,7 @@
 namespace Platine\Pagination;
 
 /**
- * Class RendererInterface
+ * @class RendererInterface
  * @package Platine\Pagination
  */
 interface RendererInterface

src/UrlGenerator/SimpleUrlGenerator.php

@@ -50,7 +50,7 @@
 use Platine\Pagination\UrlGeneratorInterface;
 
 /**
- * Class SimpleUrlGenerator
+ * @class SimpleUrlGenerator
  * @package Platine\Pagination\UrlGenerator
  */
 class SimpleUrlGenerator implements UrlGeneratorInterface

src/UrlGeneratorInterface.php

@@ -48,7 +48,7 @@
 namespace Platine\Pagination;
 
 /**
- * Class UrlGeneratorInterface
+ * @class UrlGeneratorInterface
  * @package Platine\Pagination
  */
 interface UrlGeneratorInterface