Move some functions to the parent class

Author: iranianpep

src/PhpTableGenerator/HeadCell.php

@@ -53,26 +53,6 @@ class HeadCell extends Cell
      */
     private $selectAllSelector;
 
-    /**
-     * @var
-     */
-    private $sortByKey;
-
-    /**
-     * @var
-     */
-    private $sortBy;
-
-    /**
-     * @var
-     */
-    private $sortDirKey;
-
-    /**
-     * @var
-     */
-    private $sortDir;
-
     public function __construct($title = null, $alias = null, $content = null, $htmlspecialchars = false)
     {
         if ($title !== null) {
@@ -190,83 +170,19 @@ public function setSelectable($selectable, $selectAllSelector = '')
         $this->selectAllSelector = $selectAllSelector;
     }
 
-    /**
-     * @return string
-     */
-    public function getSortByKey()
-    {
-        return $this->sortByKey;
-    }
-
-    /**
-     * @param string $sortByKey
-     */
-    public function setSortByKey($sortByKey)
-    {
-        $this->sortByKey = $sortByKey;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSortDir()
-    {
-        return $this->sortDir;
-    }
-
-    /**
-     * @param $sortDir
-     */
-    public function setSortDir($sortDir)
-    {
-        $this->sortDir = (strtolower($sortDir) === 'asc') ? 'asc' : 'desc';
-    }
-
-    /**
-     * @return string
-     */
-    public function getSortBy()
-    {
-        return $this->sortBy;
-    }
-
-    /**
-     * @param string $sortBy
-     */
-    public function setSortBy($sortBy)
-    {
-        $this->sortBy = $sortBy;
-    }
-
     /**
      * According the current sorting direction, alias, and etc return
      * the next sorting direction
      *
      * @return string
      */
-    public function getNewSortDir()
+    public function getSortDir()
     {
         $alias = $this->getAlias();
-        //$sortBy = $this->getSortBy();
-        $sortDir = $this->getSortDir();
-
-        return ($alias ===  $sortBy && $sortDir === 'asc') ? 'desc' : 'asc';
-    }
-
-    /**
-     * @return string
-     */
-    public function getSortDirKey()
-    {
-        return $this->sortDirKey;
-    }
+        $listSortBy = $this->getListSortBy();
+        $listSortDir = $this->getListSortDir();
 
-    /**
-     * @param string $sortDirKey
-     */
-    public function setSortDirKey($sortDirKey)
-    {
-        $this->sortDirKey = $sortDirKey;
+        return ($alias ===  $listSortBy && $listSortDir === 'asc') ? 'desc' : 'asc';
     }
 
     /**
@@ -294,13 +210,13 @@ public function getContent()
         }
 
         $alias = $this->getAlias();
-        $sortByKey = $this->getSortByKey();
+        $listSortByKey = $this->getListSortByKey();
 
-        $newSortDir = $this->getNewSortDir();
+        $sortDir = $this->getSortDir();
 
         $sortFunction = $config->getConfig('sorterJSFunction');
-        $sortDirKey = $this->getSortDirKey();
+        $listSortDirKey = $this->getListSortDirKey();
 
-        return "{$checkboxHtml} <a style='cursor: pointer;' onclick='{$sortFunction}(\"{$sortByKey}\", \"{$alias}\", \"{$sortDirKey}\", \"{$newSortDir}\");'>{$title}</a>";
+        return "{$checkboxHtml} <a style='cursor: pointer;' onclick='{$sortFunction}(\"{$listSortByKey}\", \"{$alias}\", \"{$listSortDirKey}\", \"{$sortDir}\");'>{$title}</a>";
     }
 }

src/PhpTableGenerator/TableGenerator.php

@@ -43,6 +43,26 @@ abstract class TableGenerator
      */
     private $data;
 
+    /**
+     * @var
+     */
+    private $listSortByKey;
+
+    /**
+     * @var
+     */
+    private $listSortBy;
+
+    /**
+     * @var
+     */
+    private $listSortDirKey;
+
+    /**
+     * @var
+     */
+    private $listSortDir;
+
     /**
      * initialize a TableGenerator object
      *
@@ -130,4 +150,68 @@ public function getAllAttributesHtml()
      * @return string
      */
     abstract public function getHtml();
+
+    /**
+     * @return string
+     */
+    public function getListSortByKey()
+    {
+        return $this->listSortByKey;
+    }
+
+    /**
+     * @param string $listSortByKey
+     */
+    public function setListSortByKey($listSortByKey)
+    {
+        $this->listSortByKey = $listSortByKey;
+    }
+
+    /**
+     * @return string
+     */
+    public function getListSortBy()
+    {
+        return $this->listSortBy;
+    }
+
+    /**
+     * @param string $listSortBy
+     */
+    public function setListSortBy($listSortBy)
+    {
+        $this->listSortBy = $listSortBy;
+    }
+
+    /**
+     * @return string
+     */
+    public function getListSortDirKey()
+    {
+        return $this->listSortDirKey;
+    }
+
+    /**
+     * @param string $listSortDirKey
+     */
+    public function setSortDirKey($listSortDirKey)
+    {
+        $this->listSortDirKey = $listSortDirKey;
+    }
+
+    /**
+     * @return string
+     */
+    public function getListSortDir()
+    {
+        return $this->listSortDir;
+    }
+
+    /**
+     * @param $listSortDir
+     */
+    public function setListSortDir($listSortDir)
+    {
+        $this->listSortDir = (strtolower($listSortDir) === 'asc') ? 'asc' : 'desc';
+    }
 }