Version 1.1.0, loosen property visibility and allow extending

Author: noplanman

.scrutinizer.yml

@@ -1,6 +1,6 @@
 build:
     environment:
-        php: 7.3.0
+        php: 7.4.0
     nodes:
         analysis:
             tests:

.travis.yml

@@ -8,7 +8,6 @@ cache:
     - $HOME/.composer/cache
 
 php:
-  - 7.3
   - 7.4
   - 8.0
   - nightly

CHANGELOG.md

@@ -5,18 +5,26 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 
 ## [Unreleased]
 ### Added
-- Bump minimum PHP to 7.3 and support PHP 8. (@MyZik) (#8)
 ### Changed
-- Bump development dependencies, update tests.
-- Improve all development configurations.
 ### Deprecated
 ### Removed
 ### Fixed
 ### Security
-- Minimum PHP 7.3. (@MyZik) (#8)
 
-## [0.1.0] - 2017-09-08
+## [1.1.0] - 2021-07-10
+### Added
+- Bump minimum PHP to 7.4 and support PHP 8. (@MyZik) (#8)
+### Changed
+- Bump development dependencies, update tests. (#11, #12)
+- Improve all development configurations. (#11)
+### Fixed
+- Strange behaviour with page 3. (#12)
+### Security
+- Minimum PHP 7.4. (@MyZik) (#8)
+
+## [1.0.0] - 2017-09-08
 ### Added
 - Initial version!
 
 [Unreleased]: https://github.com/php-telegram-bot/inline-keyboard-pagination/compare/master...develop
+[1.1.0]: https://github.com/php-telegram-bot/inline-keyboard-pagination/compare/1.0.0...1.1.0

src/InlineKeyboardPagination.php

@@ -11,14 +11,14 @@
  */
 class InlineKeyboardPagination implements InlineKeyboardPaginator
 {
-    private array $items;
-    private int $itemsPerPage;
-    private int $selectedPage;
-    private int $maxButtons = 5;
-    private bool $forceButtonCount = false;
-    private string $command;
-    private string $callbackDataFormat = 'command={COMMAND}&oldPage={OLD_PAGE}&newPage={NEW_PAGE}';
-    private array $labels = [
+    protected array $items;
+    protected int $itemsPerPage;
+    protected int $selectedPage;
+    protected int $maxButtons = 5;
+    protected bool $forceButtonCount = false;
+    protected string $command;
+    protected string $callbackDataFormat = 'command={COMMAND}&oldPage={OLD_PAGE}&newPage={NEW_PAGE}';
+    protected array $labels = [
         'default'  => '%d',
         'first'    => '« %d',
         'previous' => '‹ %d',
@@ -31,10 +31,10 @@ class InlineKeyboardPagination implements InlineKeyboardPaginator
      * @param int  $maxButtons
      * @param bool $forceButtonCount
      *
-     * @return $this
+     * @return self
      * @throws InlineKeyboardPaginationException
      */
-    public function setMaxButtons(int $maxButtons = 5, bool $forceButtonCount = false): InlineKeyboardPagination
+    public function setMaxButtons(int $maxButtons = 5, bool $forceButtonCount = false): self
     {
         if ($maxButtons < 5 || $maxButtons > 8) {
             throw InlineKeyboardPaginationException::invalidMaxButtons();
@@ -61,9 +61,9 @@ public function getCallbackDataFormat(): string
      *
      * @param string $callbackDataFormat
      *
-     * @return InlineKeyboardPagination
+     * @return self
      */
-    public function setCallbackDataFormat(string $callbackDataFormat): InlineKeyboardPagination
+    public function setCallbackDataFormat(string $callbackDataFormat): self
     {
         $this->callbackDataFormat = $callbackDataFormat;
 
@@ -85,9 +85,9 @@ public function getLabels(): array
      *
      * @param array $labels
      *
-     * @return InlineKeyboardPagination
+     * @return self
      */
-    public function setLabels(array $labels): InlineKeyboardPagination
+    public function setLabels(array $labels): self
     {
         $this->labels = $labels;
 
@@ -97,7 +97,7 @@ public function setLabels(array $labels): InlineKeyboardPagination
     /**
      * @inheritdoc
      */
-    public function setCommand(string $command = 'pagination'): InlineKeyboardPagination
+    public function setCommand(string $command = 'pagination'): self
     {
         $this->command = $command;
 
@@ -108,7 +108,7 @@ public function setCommand(string $command = 'pagination'): InlineKeyboardPagina
      * @inheritdoc
      * @throws InlineKeyboardPaginationException
      */
-    public function setSelectedPage(int $selectedPage): InlineKeyboardPagination
+    public function setSelectedPage(int $selectedPage): self
     {
         $numberOfPages = $this->getNumberOfPages();
         if ($selectedPage < 1 || $selectedPage > $numberOfPages) {
@@ -135,10 +135,10 @@ public function getItemsPerPage(): int
      *
      * @param int $itemsPerPage
      *
-     * @return InlineKeyboardPagination
+     * @return self
      * @throws InlineKeyboardPaginationException
      */
-    public function setItemsPerPage(int $itemsPerPage): InlineKeyboardPagination
+    public function setItemsPerPage(int $itemsPerPage): self
     {
         if ($itemsPerPage <= 0) {
             throw InlineKeyboardPaginationException::invalidItemsPerPage();
@@ -154,10 +154,10 @@ public function setItemsPerPage(int $itemsPerPage): InlineKeyboardPagination
      *
      * @param array $items
      *
-     * @return InlineKeyboardPagination
+     * @return self
      * @throws InlineKeyboardPaginationException
      */
-    public function setItems(array $items): InlineKeyboardPagination
+    public function setItems(array $items): self
     {
         if (empty($items)) {
             throw InlineKeyboardPaginationException::noItems();

src/InlineKeyboardPaginator.php

@@ -25,27 +25,27 @@ public function __construct(array $items, string $command, int $selectedPage, in
      * @param int  $maxButtons
      * @param bool $forceButtonCount
      *
-     * @return InlineKeyboardPagination
+     * @return self
      */
-    public function setMaxButtons(int $maxButtons = 5, bool $forceButtonCount = false): InlineKeyboardPagination;
+    public function setMaxButtons(int $maxButtons = 5, bool $forceButtonCount = false): self;
 
     /**
      * Set command for this pagination.
      *
      * @param string $command
      *
-     * @return InlineKeyboardPagination
+     * @return self
      */
-    public function setCommand(string $command = 'pagination'): InlineKeyboardPagination;
+    public function setCommand(string $command = 'pagination'): self;
 
     /**
      * Set the selected page.
      *
      * @param int $selectedPage
      *
-     * @return InlineKeyboardPagination
+     * @return self
      */
-    public function setSelectedPage(int $selectedPage): InlineKeyboardPagination;
+    public function setSelectedPage(int $selectedPage): self;
 
     /**
      * Get the pagination data for the passed page.