| @@ -64,7 +64,7 @@ | ||
| 64 | 64 | $pages[] = $first->reset()->setData($this->link, static::PREV_PAGE)->render(); | 
| 65 | 65 | |
| 66 | 66 |          foreach ($this->getDisplayPages() as $displayPage) { | 
| 67 | - $current = ($this->positions->getPager()->getActualPage() == $displayPage) ? $this->currentPage : $this->anotherPage ; | |
| 67 | + $current = ($this->positions->getPager()->getActualPage() == $displayPage) ? $this->currentPage : $this->anotherPage; | |
| 68 | 68 | $this->link->setPageNumber($displayPage); | 
| 69 | 69 | $pages[] = $current->reset()->setData($this->link, strval($displayPage))->render(); | 
| 70 | 70 | } | 
| @@ -17,17 +17,17 @@ | ||
| 17 | 17 | } | 
| 18 | 18 | $pages = []; | 
| 19 | 19 | |
| 20 | - $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . static::PREV_PAGE . ' ' . $this->positions->getFirstPage() : static::NONE_PAGE . static::NONE_PAGE ; | |
| 21 | - $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . ' ' . $this->positions->getPrevPage() : static::NONE_PAGE ; | |
| 20 | + $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . static::PREV_PAGE . ' ' . $this->positions->getFirstPage() : static::NONE_PAGE . static::NONE_PAGE; | |
| 21 | + $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . ' ' . $this->positions->getPrevPage() : static::NONE_PAGE; | |
| 22 | 22 | |
| 23 | 23 |          foreach ($this->getDisplayPages() as $displayPage) { | 
| 24 | 24 | $current = ($this->positions->getPager()->getActualPage() == $displayPage); | 
| 25 | - $pages[] = $current ? static::SELECT_PAGE . $displayPage . static::SELECT_PAGE : $displayPage ; | |
| 25 | + $pages[] = $current ? static::SELECT_PAGE . $displayPage . static::SELECT_PAGE : $displayPage; | |
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | - $pages[] = $this->positions->nextPageExists() ? $this->positions->getNextPage() . ' ' . static::NEXT_PAGE : static::NONE_PAGE ; | |
| 29 | - $pages[] = $this->positions->nextPageExists() ? $this->positions->getLastPage() . ' ' . static::NEXT_PAGE . static::NEXT_PAGE : static::NONE_PAGE . static::NONE_PAGE ; | |
| 28 | + $pages[] = $this->positions->nextPageExists() ? $this->positions->getNextPage() . ' ' . static::NEXT_PAGE : static::NONE_PAGE; | |
| 29 | + $pages[] = $this->positions->nextPageExists() ? $this->positions->getLastPage() . ' ' . static::NEXT_PAGE . static::NEXT_PAGE : static::NONE_PAGE . static::NONE_PAGE; | |
| 30 | 30 | |
| 31 | -        return implode(' | ', $pages) . ( $showPositions ? (PHP_EOL . $this->getFilledText($this->positions) ) : ''); | |
| 31 | +        return implode(' | ', $pages) . ($showPositions ? (PHP_EOL . $this->getFilledText($this->positions)) : ''); | |
| 32 | 32 | } | 
| 33 | 33 | } | 
| @@ -43,13 +43,13 @@ | ||
| 43 | 43 | } | 
| 44 | 44 | $pages = []; | 
| 45 | 45 | |
| 46 | - $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . static::PREV_PAGE . ' ' . $this->positions->getFirstPage() : static::NONE_PAGE . static::NONE_PAGE ; | |
| 47 | - $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . ' ' . $this->positions->getPrevPage() : static::NONE_PAGE ; | |
| 48 | - $pages[] = $this->positions->getPager()->getActualPage() ; | |
| 49 | - $pages[] = $this->positions->nextPageExists() ? $this->positions->getNextPage() . ' ' . static::NEXT_PAGE : static::NONE_PAGE ; | |
| 50 | - $pages[] = $this->positions->nextPageExists() ? $this->positions->getLastPage() . ' ' . static::NEXT_PAGE . static::NEXT_PAGE : static::NONE_PAGE . static::NONE_PAGE ; | |
| 46 | + $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . static::PREV_PAGE . ' ' . $this->positions->getFirstPage() : static::NONE_PAGE . static::NONE_PAGE; | |
| 47 | + $pages[] = $this->positions->prevPageExists() ? static::PREV_PAGE . ' ' . $this->positions->getPrevPage() : static::NONE_PAGE; | |
| 48 | + $pages[] = $this->positions->getPager()->getActualPage(); | |
| 49 | + $pages[] = $this->positions->nextPageExists() ? $this->positions->getNextPage() . ' ' . static::NEXT_PAGE : static::NONE_PAGE; | |
| 50 | + $pages[] = $this->positions->nextPageExists() ? $this->positions->getLastPage() . ' ' . static::NEXT_PAGE . static::NEXT_PAGE : static::NONE_PAGE . static::NONE_PAGE; | |
| 51 | 51 | |
| 52 | -        return implode(' | ', $pages) . ($showPositions ? ( PHP_EOL . $this->getFilledText($this->positions) ) : '' ); | |
| 52 | +        return implode(' | ', $pages) . ($showPositions ? (PHP_EOL . $this->getFilledText($this->positions)) : ''); | |
| 53 | 53 | } | 
| 54 | 54 | |
| 55 | 55 | public function getPager(): IPager | 
| @@ -28,7 +28,7 @@ | ||
| 28 | 28 | |
| 29 | 29 | public function getPageLink(): string | 
| 30 | 30 |      { | 
| 31 | - return (1 < $this->pageNum) ? $this->link . $this->pageNum : $this->link ; | |
| 31 | + return (1 < $this->pageNum) ? $this->link . $this->pageNum : $this->link; | |
| 32 | 32 | } | 
| 33 | 33 | } | 
| 34 | 34 | |