const refactoring

mambax7 · Dec 27, 2020 · 961c3b5 · 961c3b5
1 parent b83f7b2
commit 961c3b5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/class/CategoryHandler.php b/class/CategoryHandler.php
@@ -33,6 +33,12 @@
  */
 class CategoryHandler extends \XoopsPersistableObjectHandler
 {
+    private const TABLE = 'publisher_categories';
+    private const ENTITY = Category::class;
+    private const ENTITYNAME = 'Category';
+    private const KEYNAME = 'categoryid';
+    private const IDENTIFIER = 'name';
+
     /**
      * @var Helper
      */
@@ -45,7 +51,7 @@ public function __construct(\XoopsDatabase $db = null, Helper $helper = null)
         $this->helper = $helper ?? Helper::getInstance();
         $this->db = $db;
         $this->publisherIsAdmin = $this->helper->isUserAdmin();
-        parent::__construct($db, 'publisher_categories', Category::class, 'categoryid', 'name');
+        parent::__construct($db, static::TABLE, static::ENTITY, static::KEYNAME, static::IDENTIFIER);
     }
 
     /**

diff --git a/class/FileHandler.php b/class/FileHandler.php
@@ -38,6 +38,12 @@
  */
 class FileHandler extends \XoopsPersistableObjectHandler
 {
+    private const TABLE = 'publisher_files';
+    private const ENTITY = File::class;
+    private const ENTITYNAME = 'File';
+    private const KEYNAME = 'fileid';
+    private const IDENTIFIER = 'name';
+
     public $table_link = '';
     /**
      * @var Helper
@@ -47,9 +53,9 @@ class FileHandler extends \XoopsPersistableObjectHandler
     public function __construct(\XoopsDatabase $db = null, Helper $helper = null)
     {
         /** @var Helper $this->helper */
-$this->helper = $helper ?? Helper::getInstance();
+        $this->helper = $helper ?? Helper::getInstance();
         $this->db = $db;
-        parent::__construct($db, 'publisher_files', File::class, 'fileid', 'name');
+        parent::__construct($db, static::TABLE, static::ENTITY, static::KEYNAME, static::IDENTIFIER);
     }
 
     /**

diff --git a/class/ItemHandler.php b/class/ItemHandler.php
@@ -36,6 +36,12 @@
  */
 class ItemHandler extends \XoopsPersistableObjectHandler
 {
+    private const TABLE = 'publisher_items';
+    private const ENTITY = Item::class;
+    private const ENTITYNAME = 'Item';
+    private const KEYNAME = 'itemid';
+    private const IDENTIFIER = 'title';
+
     /**
      * @var Helper
      */
@@ -48,7 +54,7 @@ public function __construct(\XoopsDatabase $db = null, Helper $helper = null)
         $this->helper = $helper ?? Helper::getInstance();
         $this->db = $db;
         $this->publisherIsAdmin = $this->helper->isUserAdmin();
-        parent::__construct($db, 'publisher_items', Item::class, 'itemid', 'title');
+        parent::__construct($db, static::TABLE, static::ENTITY, static::KEYNAME, static::IDENTIFIER);
     }
 
     /**

diff --git a/class/RatingHandler.php b/class/RatingHandler.php
@@ -28,13 +28,18 @@
  */
 class RatingHandler extends \XoopsPersistableObjectHandler
 {
+    private const TABLE = 'publisher_rating';
+    private const ENTITY = Rating::class;
+    private const KEYNAME = 'ratingid';
+    private const IDENTIFIER = 'itemid';
+
     /**
      * RatingHandler constructor.
      * @param \XoopsDatabase|null $db
      */
     public function __construct(\XoopsDatabase $db = null)
     {
         $this->db = $db;
-        parent::__construct($db, 'publisher_rating', Rating::class, 'ratingid', 'itemid');
+        parent::__construct($db, static::TABLE, static::ENTITY, static::KEYNAME, static::IDENTIFIER);
     }
 }
diff --git a/class/RatingsHandler.php b/class/RatingsHandler.php
@@ -29,14 +29,20 @@
  */
 class RatingsHandler extends \XoopsPersistableObjectHandler
 {
+    private const TABLE = 'publisher_liking';
+    private const ENTITY = Ratings::class;
+    private const ENTITYNAME = 'Ratings';
+    private const KEYNAME = 'rate_id';
+    private const IDENTIFIER = 'rate_itemid';
+
     /**
      * Constructor
      * @param \XoopsDatabase $db
      */
     public function __construct(\XoopsDatabase $db)
     {
         $this->db = $db;
-        parent::__construct($db, 'publisher_liking', Ratings::class, 'rate_id', 'rate_itemid');
+        parent::__construct($db, static::TABLE, static::ENTITY, static::KEYNAME, static::IDENTIFIER);
     }
 
     /**