bpolaszek / bentools-pager

src/BenTools/Pager/Page.php

Spacing +10 added lines, -10 removed lines

@@ -48,8 +48,8 @@ 
     protected   $pager;
 
     public function __construct(Pager $pager, $iteration = 1) {
-        $this->pager        =    $pager;
-        $this->iteration    =    (int) $iteration;
+        $this->pager        = $pager;
+        $this->iteration    = (int) $iteration;
         $this->populate();
     }
 
@@ -73,7 +73,7 @@ 
      */
     public function getOffset() {
         if (!$this->offset)
-            $this->offset   =   ($this->getIndex() * $this->getPager()->getResultsPerPage());
+            $this->offset = ($this->getIndex() * $this->getPager()->getResultsPerPage());
         return $this->offset;
     }
 
@@ -83,7 +83,7 @@ 
      */
     public function getResultCount() {
         if (!$this->resultCount)
-            $this->resultCount   =   $this->isLastPage() ? $this->getPager()->getTotalResultCount() - $this->getOffset() : $this->getPager()->getResultsPerPage();
+            $this->resultCount = $this->isLastPage() ? $this->getPager()->getTotalResultCount() - $this->getOffset() : $this->getPager()->getResultsPerPage();
         return $this->resultCount;
     }
 
@@ -93,7 +93,7 @@ 
      */
     public function isFirstPage() {
         if (!$this->isFirstPage)
-            $this->isFirstPage    =    ($this->getIteration() == 1);
+            $this->isFirstPage = ($this->getIteration() == 1);
         return $this->isFirstPage;
     }
 
@@ -103,7 +103,7 @@ 
      */
     public function isLastPage() {
         if (!$this->isLastPage)
-            $this->isLastPage    =    ($this->getIteration() == $this->pager->getNbPages());
+            $this->isLastPage = ($this->getIteration() == $this->pager->getNbPages());
         return $this->isLastPage;
     }
 
@@ -113,7 +113,7 @@ 
      */
     public function isCurrentPage() {
         if (!$this->isCurrentPage)
-            $this->isCurrentPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration()));
+            $this->isCurrentPage = ($this->getIteration() == ($this->pager->getCurrentPageIteration()));
         return $this->isCurrentPage;
     }
 
@@ -123,7 +123,7 @@ 
      */
     public function isPreviousPage() {
         if (!$this->isPreviousPage)
-            $this->isPreviousPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() - 1));
+            $this->isPreviousPage = ($this->getIteration() == ($this->pager->getCurrentPageIteration() - 1));
         return $this->isPreviousPage;
     }
 
@@ -133,7 +133,7 @@ 
      */
     public function isNextPage() {
         if (!$this->isNextPage)
-            $this->isNextPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() + 1));
+            $this->isNextPage = ($this->getIteration() == ($this->pager->getCurrentPageIteration() + 1));
         return $this->isNextPage;
     }
 
@@ -171,7 +171,7 @@ 
             if (preg_match('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', (string) $this->pager->getUrl()))
                 $this->setUrl(new Url(preg_replace('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', sprintf($this->pager->getRewriteString(), $this->getIteration()), (string) $this->pager->getUrl())));
             else {
-                $url        =   clone $this->getPager()->getUrl();
+                $url = clone $this->getPager()->getUrl();
                 $this->setUrl($url->appendToPath(sprintf($this->getPager()->getRewriteString(), $this->getIteration())));
             }
 

Braces +33 added lines, -28 removed lines

@@ -72,8 +72,9 @@ 
      * @return int
      */
     public function getOffset() {
-        if (!$this->offset)
-            $this->offset   =   ($this->getIndex() * $this->getPager()->getResultsPerPage());
+        if (!$this->offset) {
+                    $this->offset   =   ($this->getIndex() * $this->getPager()->getResultsPerPage());
+        }
         return $this->offset;
     }
 
@@ -82,8 +83,9 @@ 
      * @return int
      */
     public function getResultCount() {
-        if (!$this->resultCount)
-            $this->resultCount   =   $this->isLastPage() ? $this->getPager()->getTotalResultCount() - $this->getOffset() : $this->getPager()->getResultsPerPage();
+        if (!$this->resultCount) {
+                    $this->resultCount   =   $this->isLastPage() ? $this->getPager()->getTotalResultCount() - $this->getOffset() : $this->getPager()->getResultsPerPage();
+        }
         return $this->resultCount;
     }
 
@@ -92,8 +94,9 @@ 
      * @return bool
      */
     public function isFirstPage() {
-        if (!$this->isFirstPage)
-            $this->isFirstPage    =    ($this->getIteration() == 1);
+        if (!$this->isFirstPage) {
+                    $this->isFirstPage    =    ($this->getIteration() == 1);
+        }
         return $this->isFirstPage;
     }
 
@@ -102,8 +105,9 @@ 
      * @return bool
      */
     public function isLastPage() {
-        if (!$this->isLastPage)
-            $this->isLastPage    =    ($this->getIteration() == $this->pager->getNbPages());
+        if (!$this->isLastPage) {
+                    $this->isLastPage    =    ($this->getIteration() == $this->pager->getNbPages());
+        }
         return $this->isLastPage;
     }
 
@@ -112,8 +116,9 @@ 
      * @return bool
      */
     public function isCurrentPage() {
-        if (!$this->isCurrentPage)
-            $this->isCurrentPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration()));
+        if (!$this->isCurrentPage) {
+                    $this->isCurrentPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration()));
+        }
         return $this->isCurrentPage;
     }
 
@@ -122,8 +127,9 @@ 
      * @return bool
      */
     public function isPreviousPage() {
-        if (!$this->isPreviousPage)
-            $this->isPreviousPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() - 1));
+        if (!$this->isPreviousPage) {
+                    $this->isPreviousPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() - 1));
+        }
         return $this->isPreviousPage;
     }
 
@@ -132,8 +138,9 @@ 
      * @return bool
      */
     public function isNextPage() {
-        if (!$this->isNextPage)
-            $this->isNextPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() + 1));
+        if (!$this->isNextPage) {
+                    $this->isNextPage    =    ($this->getIteration() == ($this->pager->getCurrentPageIteration() + 1));
+        }
         return $this->isNextPage;
     }
 
@@ -168,18 +175,17 @@ 
     public function getUrl() {
 
         if ($this->pager->getRewriteString()) {
-            if (preg_match('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', (string) $this->pager->getUrl()))
-                $this->setUrl(new Url(preg_replace('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', sprintf($this->pager->getRewriteString(), $this->getIteration()), (string) $this->pager->getUrl())));
-            else {
+            if (preg_match('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', (string) $this->pager->getUrl())) {
+                            $this->setUrl(new Url(preg_replace('#' . sprintf($this->pager->getRewriteString(), '([0-9]+)') . '#', sprintf($this->pager->getRewriteString(), $this->getIteration()), (string) $this->pager->getUrl())));
+            } else {
                 $url        =   clone $this->getPager()->getUrl();
                 $this->setUrl($url->appendToPath(sprintf($this->getPager()->getRewriteString(), $this->getIteration())));
             }
 
+        } else {
+                    $this->setUrl(Url::NewInstance($this->pager->getUrl())->setParam($this->pager->getQueryParam(), $this->getIteration()));
         }
 
-        else
-            $this->setUrl(Url::NewInstance($this->pager->getUrl())->setParam($this->pager->getQueryParam(), $this->getIteration()));
-
         return $this->url;
     }
 
@@ -216,14 +222,13 @@ 
      * @return mixed|null
      */
     public function offsetGet($offset) {
-        if (is_callable([$this, 'get' . $offset]))
-            return call_user_func([$this, 'get' . $offset]);
-
-        elseif (is_callable([$this, $offset]))
-            return call_user_func([$this, $offset]);
-
-        else
-            return null;
+        if (is_callable([$this, 'get' . $offset])) {
+                    return call_user_func([$this, 'get' . $offset]);
+        } elseif (is_callable([$this, $offset])) {
+                    return call_user_func([$this, $offset]);
+        } else {
+                    return null;
+        }
     }
 
     /**

src/BenTools/Pager/Pager.php

Spacing +20 added lines, -20 removed lines

@@ -36,44 +36,44 @@ 
  */
 class Pager implements \IteratorAggregate, \Countable, \ArrayAccess, \JsonSerializable {
 
-    const       DEFAULT_PAGE_CLASS      =   '\\BenTools\\Pager\\Page';
-    const       DEFAULT_QUERY_PARAM     =   'page';
-    const       DEFAULT_DELTA           =   1;
+    const       DEFAULT_PAGE_CLASS      = '\\BenTools\\Pager\\Page';
+    const       DEFAULT_QUERY_PARAM     = 'page';
+    const       DEFAULT_DELTA           = 1;
 
     /**
      * The class that will handle each page.
      * @var string
      */
-    protected   $pageClass              =   self::DEFAULT_PAGE_CLASS;
+    protected   $pageClass = self::DEFAULT_PAGE_CLASS;
 
     /**
      * @var int
      */
-    protected   $resultsPerPage         =   0;
+    protected   $resultsPerPage = 0;
 
     /**
      * The total results count, all pages included.
      * @var int
      */
-    protected   $totalResultCount       =   0;
+    protected   $totalResultCount = 0;
 
     /**
      * Current result count
      * @var int
      */
-    protected   $currentResultCount     =   0;
+    protected   $currentResultCount = 0;
 
     /**
      * The Query param to check in the query string
      * @var string
      */
-    protected   $queryParam             =   self::DEFAULT_QUERY_PARAM;
+    protected   $queryParam = self::DEFAULT_QUERY_PARAM;
 
     /**
      * A print_f compatible string if the page information is in a rewrite string instead of the query string
      * @var
      */
-    protected   $rewriteString          =   '';
+    protected   $rewriteString = '';
 
     /**
      * The current page iteration
@@ -85,18 +85,18 @@ 
      * How many pages to show on each side when too many pages are rendered
      * @var int
      */
-    protected   $delta                  =   self::DEFAULT_DELTA;
+    protected   $delta = self::DEFAULT_DELTA;
 
     /**
      * @var int
      */
-    protected   $nbPages                =   0;
+    protected   $nbPages = 0;
 
     /**
      * The current offset (useful for a LIMIT offset, max in a SQL clause)
      * @var int
      */
-    protected   $currentOffset          =   0;
+    protected   $currentOffset = 0;
 
     /**
      * The Url to begin with
@@ -108,7 +108,7 @@ 
      * The pages rendered by the object (if there's a delta and too many pages, not all pages will be shown)
      * @var array
      */
-    protected   $pages                  =   [];
+    protected   $pages = [];
 
     public function __construct($url = null, $resultsPerPage = null, $totalResultCount = null, $queryParam = self::DEFAULT_QUERY_PARAM, $rewriteString = null, $currentPageIteration = null, $delta = self::DEFAULT_DELTA) {
 
@@ -274,19 +274,19 @@ 
         if (!is_integer($this->totalResultCount))
             throw new PagerException(get_called_class() . "::setTotalResultCount has to be called first.");
 
-        $this->pages        =   [];
+        $this->pages = [];
 
         $this->setNbPages((int) ceil($this->getTotalResultCount() / $this->getResultsPerPage()));
 
         # Case of a delta, e.g. << 1 ... 6 [7] 8 ... 15 >>
         if ($this->getDelta()) {
 
-            $p              =   0;
+            $p              = 0;
 
             # Add first page, current page and last page
-            $this->pages[]  =   $this->getPageInstance(1);
-            $this->pages[]  =   $this->getPageInstance($this->getCurrentPageIteration());
-            $this->pages[]  =   $this->getPageInstance($this->getNbPages());
+            $this->pages[]  = $this->getPageInstance(1);
+            $this->pages[]  = $this->getPageInstance($this->getCurrentPageIteration());
+            $this->pages[]  = $this->getPageInstance($this->getNbPages());
 
             # Calculate delta
             for ($i = 1; $i <= $this->getDelta(); $i++) {
@@ -313,7 +313,7 @@ 
         }
         else {
             for ($i = 1; $i <= $this->getNbPages(); $i++)
-                $this->pages[]  =   $this->getPageInstance($i);
+                $this->pages[] = $this->getPageInstance($i);
         }
         $this->pages = array_unique((array) $this->pages);
         sort($this->pages);
@@ -467,7 +467,7 @@ 
      * @return PageInterface
      */
     public function getPageInstance($iteration) {
-        $class  =   $this->pageClass;
+        $class = $this->pageClass;
         return new $class($this, (int) $iteration);
     }
 

Braces +55 added lines, -50 removed lines

@@ -112,17 +112,15 @@ 
 
     public function __construct($url = null, $resultsPerPage = null, $totalResultCount = null, $queryParam = self::DEFAULT_QUERY_PARAM, $rewriteString = null, $currentPageIteration = null, $delta = self::DEFAULT_DELTA) {
 
-        if ($url instanceof Url)
-            $this->setUrl($url);
-
-        elseif ($url)
-            $this->setUrl(new Url($url));
-
-        elseif (isset($_SERVER['REQUEST_URI']))
-            $this->setUrl(new Url($_SERVER['REQUEST_URI']));
-
-        else
-            $this->setUrl(new Url('/'));
+        if ($url instanceof Url) {
+                    $this->setUrl($url);
+        } elseif ($url) {
+                    $this->setUrl(new Url($url));
+        } elseif (isset($_SERVER['REQUEST_URI'])) {
+                    $this->setUrl(new Url($_SERVER['REQUEST_URI']));
+        } else {
+                    $this->setUrl(new Url('/'));
+        }
 
         $this   ->  setResultsPerPage($resultsPerPage)
                 ->  setTotalResultCount($totalResultCount)
@@ -184,10 +182,11 @@ 
      */
     public function getCurrentPageIteration() {
         if (!$this->currentPageIteration) {
-            if (!is_null($this->rewriteString) && preg_match('#' . sprintf($this->rewriteString, '([0-9]+)') . '#', (string) $this->url, $matches))
-                $this->currentPageIteration = (int) ((isset($matches[1]) && $matches[1] > 0) ? $matches[1] : 1);
-            else
-                $this->currentPageIteration = ($this->url->getParam($this->queryParam)) ? (int) $this->url->getParam($this->queryParam) : 1;
+            if (!is_null($this->rewriteString) && preg_match('#' . sprintf($this->rewriteString, '([0-9]+)') . '#', (string) $this->url, $matches)) {
+                            $this->currentPageIteration = (int) ((isset($matches[1]) && $matches[1] > 0) ? $matches[1] : 1);
+            } else {
+                            $this->currentPageIteration = ($this->url->getParam($this->queryParam)) ? (int) $this->url->getParam($this->queryParam) : 1;
+            }
         }
         return (int) $this->currentPageIteration;
 
@@ -234,10 +233,11 @@ 
      * @return Page Instance
      */
     public function getPreviousPage() {
-        if ($this->getCurrentPageIteration() - 1 >= 1)
-            return $this->getPageInstance($this->getCurrentPageIteration() - 1);
-        else
-            return $this->getFirstPage();
+        if ($this->getCurrentPageIteration() - 1 >= 1) {
+                    return $this->getPageInstance($this->getCurrentPageIteration() - 1);
+        } else {
+                    return $this->getFirstPage();
+        }
     }
 
     /**
@@ -246,10 +246,11 @@ 
      * @return Page Instance
      */
     public function getNextPage() {
-        if ($this->getCurrentPageIteration() + 1 <= $this->getNbPages())
-            return $this->getPageInstance($this->getCurrentPageIteration() + 1);
-        else
-            return $this->getLastPage();
+        if ($this->getCurrentPageIteration() + 1 <= $this->getNbPages()) {
+                    return $this->getPageInstance($this->getCurrentPageIteration() + 1);
+        } else {
+                    return $this->getLastPage();
+        }
     }
 
     /**
@@ -269,10 +270,12 @@ 
      */
     public function run() {
 
-        if (!$this->resultsPerPage)
-            throw new PagerException(get_called_class() . "::setResultsPerPage has to be called first.");
-        if (!is_integer($this->totalResultCount))
-            throw new PagerException(get_called_class() . "::setTotalResultCount has to be called first.");
+        if (!$this->resultsPerPage) {
+                    throw new PagerException(get_called_class() . "::setResultsPerPage has to be called first.");
+        }
+        if (!is_integer($this->totalResultCount)) {
+                    throw new PagerException(get_called_class() . "::setTotalResultCount has to be called first.");
+        }
 
         $this->pages        =   [];
 
@@ -293,27 +296,31 @@ 
 
                 ####    SUPERIOR DELTA        ####
                 # If the next page doesn't overtstep the last one
-                if ($this->getCurrentPageIteration() + $i <= $this->getNbPages())
-                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() + $i);
+                if ($this->getCurrentPageIteration() + $i <= $this->getNbPages()) {
+                                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() + $i);
+                }
 
                 # Otherwise, we put the remaining delta before, providing it doesn't overstep the 1st one
-                elseif ($this->getCurrentPageIteration() - $i >= 1)
-                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() - $i);
+                elseif ($this->getCurrentPageIteration() - $i >= 1) {
+                                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() - $i);
+                }
 
                 ####    INFERIOR DELTA        ####
                 # If the previous page doesn't overstep the 1st one
-                if ($this->getCurrentPageIteration() - $i >= 1)
-                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() - $i);
+                if ($this->getCurrentPageIteration() - $i >= 1) {
+                                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() - $i);
+                }
 
                 # Otherwise, we put the remaining delta before, providing it doesn't overstep the last one
-                elseif ($this->getCurrentPageIteration() + $i <= $this->getNbPages())
-                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() + $i);
+                elseif ($this->getCurrentPageIteration() + $i <= $this->getNbPages()) {
+                                    $this->pages[] = $this->getPageInstance($this->getCurrentPageIteration() + $i);
+                }
 
             }
-        }
-        else {
-            for ($i = 1; $i <= $this->getNbPages(); $i++)
-                $this->pages[]  =   $this->getPageInstance($i);
+        } else {
+            for ($i = 1; $i <= $this->getNbPages(); $i++) {
+                            $this->pages[]  =   $this->getPageInstance($i);
+            }
         }
         $this->pages = array_unique((array) $this->pages);
         sort($this->pages);
@@ -487,17 +494,15 @@ 
      */
     public function offsetGet($offset) {
 
-        if (is_numeric($offset))
-            return array_key_exists($offset, $this->getPages()) ? $this->getPages()[$offset] : null;
-
-        elseif (is_callable([$this, 'get' . $offset]))
-            return call_user_func([$this, 'get' . $offset]);
-
-        elseif (is_callable([$this, 'is' . $offset]))
-            return call_user_func([$this, 'is' . $offset]);
-
-        else
-            return null;
+        if (is_numeric($offset)) {
+                    return array_key_exists($offset, $this->getPages()) ? $this->getPages()[$offset] : null;
+        } elseif (is_callable([$this, 'get' . $offset])) {
+                    return call_user_func([$this, 'get' . $offset]);
+        } elseif (is_callable([$this, 'is' . $offset])) {
+                    return call_user_func([$this, 'is' . $offset]);
+        } else {
+                    return null;
+        }
     }
 
     /**