softberg / quantum-php-core

src/Libraries/Database/Sleekdb/Statements/Result.php

Indentation +9 added lines, -9 removed lines

@@ -46,15 +46,15 @@
         return $result;
     }
 
-	  /**
-	   * @param int $perPage
-	   * @param int $currentPage
-	   * @return PaginatorInterface
-	   */
-	  public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface
-	  {
-		  return new Paginator($this, $perPage, $currentPage);
-	  }
+        /**
+         * @param int $perPage
+         * @param int $currentPage
+         * @return PaginatorInterface
+         */
+        public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface
+        {
+            return new Paginator($this, $perPage, $currentPage);
+        }
 
     /**
      * @inheritDoc

src/Libraries/Database/Sleekdb/SleekDbal.php

Indentation +14 added lines, -14 removed lines

@@ -182,20 +182,20 @@
         self::$connection = $config;
     }
 
-		public function setData(array $data)
-		{
-			$this->data = $data;
-		}
-
-		public function setModifiedFields($modifiedFields)
-		{
-			$this->modifiedFields = $modifiedFields;
-		}
-
-		public function setIsNew($isNew)
-		{
-			$this->isNew = $isNew;
-		}
+        public function setData(array $data)
+        {
+            $this->data = $data;
+        }
+
+        public function setModifiedFields($modifiedFields)
+        {
+            $this->modifiedFields = $modifiedFields;
+        }
+
+        public function setIsNew($isNew)
+        {
+            $this->isNew = $isNew;
+        }
 
     /**
      * @inheritDoc

src/Libraries/Database/Idiorm/Statements/Result.php

Indentation +9 added lines, -9 removed lines

@@ -35,15 +35,15 @@
         return $this->getOrmModel()->find_many();
     }
 
-	  /**
-	   * @param int $perPage
-	   * @param int $currentPage
-	   * @return PaginatorInterface
-	   */
-	  public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface
-	  {
-	  	  return new Paginator($this, $perPage, $currentPage);
-	  }
+        /**
+         * @param int $perPage
+         * @param int $currentPage
+         * @return PaginatorInterface
+         */
+        public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface
+        {
+            return new Paginator($this, $perPage, $currentPage);
+        }
 
     /**
      * @inheritDoc

src/Libraries/Database/DbalInterface.php

Indentation +6 added lines, -6 removed lines

@@ -144,12 +144,12 @@
      */
     public function get();
 
-		/**
-		 * @param int $perPage
-		 * @param int $currentPage
-		 * @return PaginatorInterface
-		 */
-		public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface;
+        /**
+         * @param int $perPage
+         * @param int $currentPage
+         * @return PaginatorInterface
+         */
+        public function paginate(int $perPage, int $currentPage = 1): PaginatorInterface;
 
     /**
      * Returns the count

src/Libraries/Database/PaginatorInterface.php

Indentation +16 added lines, -16 removed lines

@@ -4,35 +4,35 @@
 
 interface PaginatorInterface
 {
-	public function getPagination(bool $withBaseUrl): ?string;
+    public function getPagination(bool $withBaseUrl): ?string;
 
-	public function currentPageNumber(): int;
+    public function currentPageNumber(): int;
 
-	public function currentPageLink(bool $withBaseUrl): ?string;
+    public function currentPageLink(bool $withBaseUrl): ?string;
 
-	public function previousPageLink(bool $withBaseUrl): ?string;
+    public function previousPageLink(bool $withBaseUrl): ?string;
 
-	public function previousPageNumber(): ?int;
+    public function previousPageNumber(): ?int;
 
-	public function firstPageLink(bool $withBaseUrl): ?string;
+    public function firstPageLink(bool $withBaseUrl): ?string;
 
-	public function nextPageLink(bool $withBaseUrl): ?string;
+    public function nextPageLink(bool $withBaseUrl): ?string;
 
-	public function nextPageNumber(): ?int;
+    public function nextPageNumber(): ?int;
 
-	public function lastPageLink(bool $withBaseUrl): ?string;
+    public function lastPageLink(bool $withBaseUrl): ?string;
 	
-	public function lastPageNumber();
+    public function lastPageNumber();
 
-	public function firstItem();
+    public function firstItem();
 
-	public function lastItem();
+    public function lastItem();
 
-	public function perPage();
+    public function perPage();
 
-	public function total();
+    public function total();
 
-	public function links(bool $withBaseUrl);
+    public function links(bool $withBaseUrl);
 
-	public function data();
+    public function data();
 }

src/Libraries/Database/Sleekdb/Paginator.php

Indentation +57 added lines, -57 removed lines

@@ -11,67 +11,67 @@
 
 class Paginator extends BasePaginator
 {
-	/**
-	 * @var SleekDbal
-	 */
-	private $dbal;
+    /**
+     * @var SleekDbal
+     */
+    private $dbal;
 
-	/**
-	 * @var array
-	 */
-	public $data;
+    /**
+     * @var array
+     */
+    public $data;
 
-	/**
-	 * @param $sleekDbal
-	 * @param int $perPage
-	 * @param int $page
-	 * @throws DatabaseException
-	 * @throws ModelException
-	 * @throws IOException
-	 * @throws InvalidArgumentException
-	 * @throws InvalidConfigurationException
-	 */
-	public function __construct($sleekDbal, int $perPage, int $page = 1)
-	{
-		/** @var SleekDbal $sleekDbal */
-		$this->total = count($sleekDbal->getBuilder()->getQuery()->fetch());
-		$this->dbal = $sleekDbal;
-		$this->dbal->limit($perPage)->offset($perPage * ($page - 1));
-		$this->data = $this->dbal->getBuilder()->getQuery()->fetch();
-		$this->perPage = $perPage;
-		$this->page = $page;
-		$this->baseUrl = base_url();
-	}
+    /**
+     * @param $sleekDbal
+     * @param int $perPage
+     * @param int $page
+     * @throws DatabaseException
+     * @throws ModelException
+     * @throws IOException
+     * @throws InvalidArgumentException
+     * @throws InvalidConfigurationException
+     */
+    public function __construct($sleekDbal, int $perPage, int $page = 1)
+    {
+        /** @var SleekDbal $sleekDbal */
+        $this->total = count($sleekDbal->getBuilder()->getQuery()->fetch());
+        $this->dbal = $sleekDbal;
+        $this->dbal->limit($perPage)->offset($perPage * ($page - 1));
+        $this->data = $this->dbal->getBuilder()->getQuery()->fetch();
+        $this->perPage = $perPage;
+        $this->page = $page;
+        $this->baseUrl = base_url();
+    }
 
-	/**
-	 * @return mixed
-	 */
-	public function firstItem()
-	{
-		return $this->data[array_key_first($this->data)];
-	}
+    /**
+     * @return mixed
+     */
+    public function firstItem()
+    {
+        return $this->data[array_key_first($this->data)];
+    }
 
-	/**
-	 * @return mixed
-	 */
-	public function lastItem()
-	{
-		return $this->data[array_key_last($this->data)];
-	}
+    /**
+     * @return mixed
+     */
+    public function lastItem()
+    {
+        return $this->data[array_key_last($this->data)];
+    }
 
-	/**
-	 * @return array|SleekDbal[]
-	 */
-	public function data(): array
-	{
-		$result = array_map(function ($element) {
-			$item = clone $this->dbal;
-			$item->setData($element);
-			$item->setModifiedFields($element);
-			$item->setIsNew(false);
-			return $item;
-		}, $this->data);
+    /**
+     * @return array|SleekDbal[]
+     */
+    public function data(): array
+    {
+        $result = array_map(function ($element) {
+            $item = clone $this->dbal;
+            $item->setData($element);
+            $item->setModifiedFields($element);
+            $item->setIsNew(false);
+            return $item;
+        }, $this->data);
 
-		return $result ?? [];
-	}
+        return $result ?? [];
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function data(): array
 	{
-		$result = array_map(function ($element) {
+		$result = array_map(function($element) {
 			$item = clone $this->dbal;
 			$item->setData($element);
 			$item->setModifiedFields($element);

src/Libraries/Database/Idiorm/Paginator.php

Indentation +52 added lines, -52 removed lines

@@ -8,61 +8,61 @@
 
 class Paginator extends BasePaginator
 {
-	/**
-	 * @var IdiormDbal
-	 */
-	private $dbal;
+    /**
+     * @var IdiormDbal
+     */
+    private $dbal;
 
-	/**
-	 * @var array|IdiormResultSet
-	 */
-	public $data;
+    /**
+     * @var array|IdiormResultSet
+     */
+    public $data;
 
-	/**
-	 * @param $idiormDbal
-	 * @param int $perPage
-	 * @param int $page
-	 * @throws DatabaseException
-	 */
-	public function __construct($idiormDbal, int $perPage, int $page = 1)
-	{
-		/** @var IdiormDbal $idiormDbal */
-		$this->total = $idiormDbal->getOrmModel()->count();
-		$this->dbal = $idiormDbal;
-		$this->dbal->limit($perPage)->offset($perPage * ($page - 1));
-		$this->data = $this->dbal->getOrmModel()->find_many();
-		$this->perPage = $perPage;
-		$this->page = $page;
-		$this->baseUrl = base_dir();
-	}
+    /**
+     * @param $idiormDbal
+     * @param int $perPage
+     * @param int $page
+     * @throws DatabaseException
+     */
+    public function __construct($idiormDbal, int $perPage, int $page = 1)
+    {
+        /** @var IdiormDbal $idiormDbal */
+        $this->total = $idiormDbal->getOrmModel()->count();
+        $this->dbal = $idiormDbal;
+        $this->dbal->limit($perPage)->offset($perPage * ($page - 1));
+        $this->data = $this->dbal->getOrmModel()->find_many();
+        $this->perPage = $perPage;
+        $this->page = $page;
+        $this->baseUrl = base_dir();
+    }
 
-	/**
-	 * @return mixed
-	 */
-	public function firstItem()
-	{
-		if (!is_array($this->data)){
-			$this->data = $this->data->as_array();
-		}
-		return $this->data[array_key_first($this->data)];
-	}
+    /**
+     * @return mixed
+     */
+    public function firstItem()
+    {
+        if (!is_array($this->data)){
+            $this->data = $this->data->as_array();
+        }
+        return $this->data[array_key_first($this->data)];
+    }
 
-	/**
-	 * @return mixed
-	 */
-	public function lastItem()
-	{
-		if (!is_array($this->data)){
-			$this->data = $this->data->as_array();
-		}
-		return $this->data[array_key_last($this->data)];
-	}
+    /**
+     * @return mixed
+     */
+    public function lastItem()
+    {
+        if (!is_array($this->data)){
+            $this->data = $this->data->as_array();
+        }
+        return $this->data[array_key_last($this->data)];
+    }
 
-	/**
-	 * @return array|IdiormResultSet
-	 */
-	public function data()
-	{
-		return $this->data ?? [];
-	}
+    /**
+     * @return array|IdiormResultSet
+     */
+    public function data()
+    {
+        return $this->data ?? [];
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function firstItem()
 	{
-		if (!is_array($this->data)){
+		if (!is_array($this->data)) {
 			$this->data = $this->data->as_array();
 		}
 		return $this->data[array_key_first($this->data)];
@@ -52,7 +52,7 @@ 
 	 */
 	public function lastItem()
 	{
-		if (!is_array($this->data)){
+		if (!is_array($this->data)) {
 			$this->data = $this->data->as_array();
 		}
 		return $this->data[array_key_last($this->data)];

src/Libraries/Database/BasePaginator.php

Indentation +324 added lines, -324 removed lines

@@ -4,329 +4,329 @@
 
 abstract class BasePaginator implements PaginatorInterface
 {
-	/**
-	 * @var string
-	 */
-	protected const PAGINATION_CLASS = 'pagination';
-
-	/**
-	 * @var string
-	 */
-	protected const PAGINATION_CLASS_ACTIVE = 'active';
-
-	/**
-	 * @var string
-	 */
-	protected const PER_PAGE = 'per_page';
-
-	/**
-	 * @var string
-	 */
-	protected const PAGE = 'page';
-
-	/**
-	 * @var int
-	 */
-	protected const FIRST_PAGE_NUMBER = 1;
-
-	/**
-	 * @var int
-	 */
-	protected const MINIMUM_PAGE_ITEMS_COUNT = 3;
-
-	/**
-	 * @var int
-	 */
-	protected const EDGE_PADDING = 3;
-
-	/**
-	 * @var int
-	 */
-	protected $total;
-
-	/**
-	 * @var string
-	 */
-	protected $baseUrl;
-
-	/**
-	 * @var int
-	 */
-	protected $perPage;
-
-	/**
-	 * @var int
-	 */
-	protected $page;
-
-	/**
-	 * @return int
-	 */
-	public function currentPageNumber(): int
-	{
-		return $this->page;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string|null
-	 */
-	public function currentPageLink(bool $withBaseUrl = false): ?string
-	{
-		return $this->getPageLink($this->page, $withBaseUrl);
-	}
-
-	/**
-	 * @return int|null
-	 */
-	public function previousPageNumber(): ?int
-	{
-		$previous = null;
-		if ($this->page > 1) {
-			$previous = $this->page - 1;
-		} elseif ($this->page == 1) {
-			$previous = $this->page;
-		}
-
-		return $previous;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string|null
-	 */
-	public function previousPageLink(bool $withBaseUrl = false): ?string
-	{
-		return $this->getPageLink($this->previousPageNumber(), $withBaseUrl);
-	}
-
-	/**
-	 * @return int|null
-	 */
-	public function nextPageNumber(): ?int
-	{
-		$next = null;
-		if ($this->page < $this->lastPageNumber()) {
-			$next = $this->page + 1;
-		} elseif ($this->page == $this->lastPageNumber()) {
-			$next = $this->page;
-		}
-		return $next;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string|null
-	 */
-	public function nextPageLink(bool $withBaseUrl = false): ?string
-	{
-		return $this->getPageLink($this->nextPageNumber(), $withBaseUrl);
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string|null
-	 */
-	public function firstPageLink(bool $withBaseUrl = false): ?string
-	{
-		return $this->getPageLink(self::FIRST_PAGE_NUMBER, $withBaseUrl);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function lastPageNumber(): int
-	{
-		return (int)ceil($this->total() / $this->perPage);
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string|null
-	 */
-	public function lastPageLink(bool $withBaseUrl = false): ?string
-	{
-		return $this->getPageLink($this->lastPageNumber(), $withBaseUrl);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function perPage(): int
-	{
-		return $this->perPage;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function total(): int
-	{
-		return $this->total;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return array
-	 */
-	public function links(bool $withBaseUrl = false): array
-	{
-		$links = [];
-		for ($i = 1; $i <= $this->lastPageNumber(); $i++) {
-			$links[] = $this->getPageLink($i, $withBaseUrl);
-		}
-
-		return $links;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @return string
-	 */
-	protected function getUri(bool $withBaseUrl = false): string
-	{
-		$routeUrl = preg_replace('/([?&](page|per_page)=\d+)/', '', route_uri());
-		$routeUrl = preg_replace('/&/', '?', $routeUrl, 1);
-		$url = $routeUrl;
-
-		if ($withBaseUrl) {
-			$url = $this->baseUrl . $routeUrl;
-		}
-
-		$delimiter = strpos($url, '?') ? '&' : '?';
-		return $url . $delimiter;
-	}
-
-	protected function getPageLink($pageNumber, $withBaseUrl = false): ?string
-	{
-		if (!empty($pageNumber)){
-			return $this->getUri($withBaseUrl) . self::PER_PAGE .'=' . $this->perPage . '&'. self::PAGE .'=' . $pageNumber;
-		}
-		return null;
-	}
-
-	/**
-	 * @param bool $withBaseUrl
-	 * @param $pageItemsCount
-	 * @return string|null
-	 */
-	public function getPagination(bool $withBaseUrl = false, $pageItemsCount = null): ?string
-	{
-		$totalPages = $this->lastPageNumber();
-		if ($totalPages <= 1) {
-			return null;
-		}
-
-		if (!is_null($pageItemsCount) && $pageItemsCount < self::MINIMUM_PAGE_ITEMS_COUNT) {
-			$pageItemsCount = self::MINIMUM_PAGE_ITEMS_COUNT;
-		}
-
-		$pagination = '<ul class="'. self::PAGINATION_CLASS .'">';
-		$currentPage = $this->currentPageNumber();
+    /**
+     * @var string
+     */
+    protected const PAGINATION_CLASS = 'pagination';
+
+    /**
+     * @var string
+     */
+    protected const PAGINATION_CLASS_ACTIVE = 'active';
+
+    /**
+     * @var string
+     */
+    protected const PER_PAGE = 'per_page';
+
+    /**
+     * @var string
+     */
+    protected const PAGE = 'page';
+
+    /**
+     * @var int
+     */
+    protected const FIRST_PAGE_NUMBER = 1;
+
+    /**
+     * @var int
+     */
+    protected const MINIMUM_PAGE_ITEMS_COUNT = 3;
+
+    /**
+     * @var int
+     */
+    protected const EDGE_PADDING = 3;
+
+    /**
+     * @var int
+     */
+    protected $total;
+
+    /**
+     * @var string
+     */
+    protected $baseUrl;
+
+    /**
+     * @var int
+     */
+    protected $perPage;
+
+    /**
+     * @var int
+     */
+    protected $page;
+
+    /**
+     * @return int
+     */
+    public function currentPageNumber(): int
+    {
+        return $this->page;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string|null
+     */
+    public function currentPageLink(bool $withBaseUrl = false): ?string
+    {
+        return $this->getPageLink($this->page, $withBaseUrl);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function previousPageNumber(): ?int
+    {
+        $previous = null;
+        if ($this->page > 1) {
+            $previous = $this->page - 1;
+        } elseif ($this->page == 1) {
+            $previous = $this->page;
+        }
+
+        return $previous;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string|null
+     */
+    public function previousPageLink(bool $withBaseUrl = false): ?string
+    {
+        return $this->getPageLink($this->previousPageNumber(), $withBaseUrl);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function nextPageNumber(): ?int
+    {
+        $next = null;
+        if ($this->page < $this->lastPageNumber()) {
+            $next = $this->page + 1;
+        } elseif ($this->page == $this->lastPageNumber()) {
+            $next = $this->page;
+        }
+        return $next;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string|null
+     */
+    public function nextPageLink(bool $withBaseUrl = false): ?string
+    {
+        return $this->getPageLink($this->nextPageNumber(), $withBaseUrl);
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string|null
+     */
+    public function firstPageLink(bool $withBaseUrl = false): ?string
+    {
+        return $this->getPageLink(self::FIRST_PAGE_NUMBER, $withBaseUrl);
+    }
+
+    /**
+     * @return int
+     */
+    public function lastPageNumber(): int
+    {
+        return (int)ceil($this->total() / $this->perPage);
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string|null
+     */
+    public function lastPageLink(bool $withBaseUrl = false): ?string
+    {
+        return $this->getPageLink($this->lastPageNumber(), $withBaseUrl);
+    }
+
+    /**
+     * @return int
+     */
+    public function perPage(): int
+    {
+        return $this->perPage;
+    }
+
+    /**
+     * @return int
+     */
+    public function total(): int
+    {
+        return $this->total;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return array
+     */
+    public function links(bool $withBaseUrl = false): array
+    {
+        $links = [];
+        for ($i = 1; $i <= $this->lastPageNumber(); $i++) {
+            $links[] = $this->getPageLink($i, $withBaseUrl);
+        }
+
+        return $links;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @return string
+     */
+    protected function getUri(bool $withBaseUrl = false): string
+    {
+        $routeUrl = preg_replace('/([?&](page|per_page)=\d+)/', '', route_uri());
+        $routeUrl = preg_replace('/&/', '?', $routeUrl, 1);
+        $url = $routeUrl;
+
+        if ($withBaseUrl) {
+            $url = $this->baseUrl . $routeUrl;
+        }
+
+        $delimiter = strpos($url, '?') ? '&' : '?';
+        return $url . $delimiter;
+    }
+
+    protected function getPageLink($pageNumber, $withBaseUrl = false): ?string
+    {
+        if (!empty($pageNumber)){
+            return $this->getUri($withBaseUrl) . self::PER_PAGE .'=' . $this->perPage . '&'. self::PAGE .'=' . $pageNumber;
+        }
+        return null;
+    }
+
+    /**
+     * @param bool $withBaseUrl
+     * @param $pageItemsCount
+     * @return string|null
+     */
+    public function getPagination(bool $withBaseUrl = false, $pageItemsCount = null): ?string
+    {
+        $totalPages = $this->lastPageNumber();
+        if ($totalPages <= 1) {
+            return null;
+        }
+
+        if (!is_null($pageItemsCount) && $pageItemsCount < self::MINIMUM_PAGE_ITEMS_COUNT) {
+            $pageItemsCount = self::MINIMUM_PAGE_ITEMS_COUNT;
+        }
+
+        $pagination = '<ul class="'. self::PAGINATION_CLASS .'">';
+        $currentPage = $this->currentPageNumber();
 		
-		if ($currentPage > 1) {
-			$pagination .= $this->getPreviousPageItem($this->previousPageLink());
-		}
-
-		if ($pageItemsCount) {
-			$pagination = $this->getPageItems($pagination, $currentPage, $totalPages, $pageItemsCount, $withBaseUrl);
-		}
-
-		if ($currentPage < $totalPages) {
-			$pagination .= $this->getNextPageItem($this->nextPageLink());
-		}
-
-		$pagination .= '</ul>';
-
-		return $pagination;
-	}
-
-	/**
-	 * @param $pagination
-	 * @param $currentPage
-	 * @param $totalPages
-	 * @param $pageItemsCount
-	 * @param bool $withBaseUrl
-	 * @return mixed|string
-	 */
-	protected function getPageItems($pagination, $currentPage, $totalPages, $pageItemsCount, bool $withBaseUrl = false)
-	{
-		$startPage = $this->calculateStartPage($currentPage, $pageItemsCount);
-		$endPage = $this->calculateEndPage($startPage, $totalPages, $pageItemsCount);
-
-		$pagination = $this->addFirstPageLink($pagination, $startPage);
-
-		$links = $this->links($withBaseUrl);
-		$pagination = $this->getItemsLinks($pagination, $startPage, $endPage, $currentPage, $links);
-
-		return $this->addLastPageLink($pagination, $endPage, $totalPages, $links);
-	}
-
-	/**
-	 * @param string|null $nextPageLink
-	 * @return string
-	 */
-	protected function getNextPageItem(?string $nextPageLink): string
-	{
-		$link = '';
-		if (!empty($nextPageLink)){
-			$link = '<li><a href="' . $nextPageLink . '">Next &raquo;</a></li>';
-		}
-		return $link;
-	}
-
-	/**
-	 * @param string|null $previousPageLink
-	 * @return string
-	 */
-	protected function getPreviousPageItem(?string $previousPageLink): string
-	{
-		$link = '';
-		if (!empty($previousPageLink)){
-			$link = '<li><a href="' . $previousPageLink . '">&laquo; Previous</a></li>';
-		}
-		return $link;
-	}
-
-	protected function getItemsLinks($pagination, $startPage, $endPage, $currentPage, array $links)
-	{
-		for ($i = $startPage; $i <= $endPage; $i++) {
-			$active = $i == $currentPage ? 'class="'. self::PAGINATION_CLASS_ACTIVE .'"' : '';
-			$pagination .= '<li ' . $active . '><a href="' . $links[$i - 1] . '">' . $i . '</a></li>';
-		}
-		return $pagination;
-	}
-
-	protected function calculateStartPage($currentPage, $pageItemsCount)
-	{
-		return max(1, $currentPage - ceil(($pageItemsCount - self::EDGE_PADDING) / 2));
-	}
-
-	protected function calculateEndPage($startPage, $totalPages, $pageItemsCount)
-	{
-		$endPage = min($totalPages, $startPage + $pageItemsCount - self::EDGE_PADDING);
-		return max(1, $endPage - $pageItemsCount + self::EDGE_PADDING);
-	}
-
-	protected function addFirstPageLink($pagination, $startPage)
-	{
-		if ($startPage > 1) {
-			$pagination .= '<li><a href="' . $this->firstPageLink() . '">'. self::FIRST_PAGE_NUMBER .'</a></li>';
-			if ($startPage > 2) {
-				$pagination .= '<li><span>...</span></li>';
-			}
-		}
-		return $pagination;
-	}
-
-	protected function addLastPageLink($pagination, $endPage, $totalPages, $links)
-	{
-		if ($endPage < $totalPages) {
-			if ($endPage < $totalPages - 1) {
-				$pagination .= '<li><span>...</span></li>';
-			}
-			$pagination .= '<li><a href="' . $links[$totalPages - 1] . '">' . $totalPages . '</a></li>';
-		}
-		return $pagination;
-	}
+        if ($currentPage > 1) {
+            $pagination .= $this->getPreviousPageItem($this->previousPageLink());
+        }
+
+        if ($pageItemsCount) {
+            $pagination = $this->getPageItems($pagination, $currentPage, $totalPages, $pageItemsCount, $withBaseUrl);
+        }
+
+        if ($currentPage < $totalPages) {
+            $pagination .= $this->getNextPageItem($this->nextPageLink());
+        }
+
+        $pagination .= '</ul>';
+
+        return $pagination;
+    }
+
+    /**
+     * @param $pagination
+     * @param $currentPage
+     * @param $totalPages
+     * @param $pageItemsCount
+     * @param bool $withBaseUrl
+     * @return mixed|string
+     */
+    protected function getPageItems($pagination, $currentPage, $totalPages, $pageItemsCount, bool $withBaseUrl = false)
+    {
+        $startPage = $this->calculateStartPage($currentPage, $pageItemsCount);
+        $endPage = $this->calculateEndPage($startPage, $totalPages, $pageItemsCount);
+
+        $pagination = $this->addFirstPageLink($pagination, $startPage);
+
+        $links = $this->links($withBaseUrl);
+        $pagination = $this->getItemsLinks($pagination, $startPage, $endPage, $currentPage, $links);
+
+        return $this->addLastPageLink($pagination, $endPage, $totalPages, $links);
+    }
+
+    /**
+     * @param string|null $nextPageLink
+     * @return string
+     */
+    protected function getNextPageItem(?string $nextPageLink): string
+    {
+        $link = '';
+        if (!empty($nextPageLink)){
+            $link = '<li><a href="' . $nextPageLink . '">Next &raquo;</a></li>';
+        }
+        return $link;
+    }
+
+    /**
+     * @param string|null $previousPageLink
+     * @return string
+     */
+    protected function getPreviousPageItem(?string $previousPageLink): string
+    {
+        $link = '';
+        if (!empty($previousPageLink)){
+            $link = '<li><a href="' . $previousPageLink . '">&laquo; Previous</a></li>';
+        }
+        return $link;
+    }
+
+    protected function getItemsLinks($pagination, $startPage, $endPage, $currentPage, array $links)
+    {
+        for ($i = $startPage; $i <= $endPage; $i++) {
+            $active = $i == $currentPage ? 'class="'. self::PAGINATION_CLASS_ACTIVE .'"' : '';
+            $pagination .= '<li ' . $active . '><a href="' . $links[$i - 1] . '">' . $i . '</a></li>';
+        }
+        return $pagination;
+    }
+
+    protected function calculateStartPage($currentPage, $pageItemsCount)
+    {
+        return max(1, $currentPage - ceil(($pageItemsCount - self::EDGE_PADDING) / 2));
+    }
+
+    protected function calculateEndPage($startPage, $totalPages, $pageItemsCount)
+    {
+        $endPage = min($totalPages, $startPage + $pageItemsCount - self::EDGE_PADDING);
+        return max(1, $endPage - $pageItemsCount + self::EDGE_PADDING);
+    }
+
+    protected function addFirstPageLink($pagination, $startPage)
+    {
+        if ($startPage > 1) {
+            $pagination .= '<li><a href="' . $this->firstPageLink() . '">'. self::FIRST_PAGE_NUMBER .'</a></li>';
+            if ($startPage > 2) {
+                $pagination .= '<li><span>...</span></li>';
+            }
+        }
+        return $pagination;
+    }
+
+    protected function addLastPageLink($pagination, $endPage, $totalPages, $links)
+    {
+        if ($endPage < $totalPages) {
+            if ($endPage < $totalPages - 1) {
+                $pagination .= '<li><span>...</span></li>';
+            }
+            $pagination .= '<li><a href="' . $links[$totalPages - 1] . '">' . $totalPages . '</a></li>';
+        }
+        return $pagination;
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -137,7 +137,7 @@ 
 	 */
 	public function lastPageNumber(): int
 	{
-		return (int)ceil($this->total() / $this->perPage);
+		return (int) ceil($this->total() / $this->perPage);
 	}
 
 	/**
@@ -199,8 +199,8 @@ 
 
 	protected function getPageLink($pageNumber, $withBaseUrl = false): ?string
 	{
-		if (!empty($pageNumber)){
-			return $this->getUri($withBaseUrl) . self::PER_PAGE .'=' . $this->perPage . '&'. self::PAGE .'=' . $pageNumber;
+		if (!empty($pageNumber)) {
+			return $this->getUri($withBaseUrl) . self::PER_PAGE . '=' . $this->perPage . '&' . self::PAGE . '=' . $pageNumber;
 		}
 		return null;
 	}
@@ -221,7 +221,7 @@ 
 			$pageItemsCount = self::MINIMUM_PAGE_ITEMS_COUNT;
 		}
 
-		$pagination = '<ul class="'. self::PAGINATION_CLASS .'">';
+		$pagination = '<ul class="' . self::PAGINATION_CLASS . '">';
 		$currentPage = $this->currentPageNumber();
 		
 		if ($currentPage > 1) {
@@ -269,7 +269,7 @@ 
 	protected function getNextPageItem(?string $nextPageLink): string
 	{
 		$link = '';
-		if (!empty($nextPageLink)){
+		if (!empty($nextPageLink)) {
 			$link = '<li><a href="' . $nextPageLink . '">Next &raquo;</a></li>';
 		}
 		return $link;
@@ -282,7 +282,7 @@ 
 	protected function getPreviousPageItem(?string $previousPageLink): string
 	{
 		$link = '';
-		if (!empty($previousPageLink)){
+		if (!empty($previousPageLink)) {
 			$link = '<li><a href="' . $previousPageLink . '">&laquo; Previous</a></li>';
 		}
 		return $link;
@@ -291,7 +291,7 @@ 
 	protected function getItemsLinks($pagination, $startPage, $endPage, $currentPage, array $links)
 	{
 		for ($i = $startPage; $i <= $endPage; $i++) {
-			$active = $i == $currentPage ? 'class="'. self::PAGINATION_CLASS_ACTIVE .'"' : '';
+			$active = $i == $currentPage ? 'class="' . self::PAGINATION_CLASS_ACTIVE . '"' : '';
 			$pagination .= '<li ' . $active . '><a href="' . $links[$i - 1] . '">' . $i . '</a></li>';
 		}
 		return $pagination;
@@ -311,7 +311,7 @@ 
 	protected function addFirstPageLink($pagination, $startPage)
 	{
 		if ($startPage > 1) {
-			$pagination .= '<li><a href="' . $this->firstPageLink() . '">'. self::FIRST_PAGE_NUMBER .'</a></li>';
+			$pagination .= '<li><a href="' . $this->firstPageLink() . '">' . self::FIRST_PAGE_NUMBER . '</a></li>';
 			if ($startPage > 2) {
 				$pagination .= '<li><span>...</span></li>';
 			}