From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 10 Jan 2019 12:05:09 +0000 (+0100)
Subject: Adjusted class hierachy for some rebuild data workers
X-Git-Tag: 5.2.0_Alpha_1~365^2~19
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=305e62339c6cacab1604bedb123bc55ca61f4083;p=GitHub%2FWoltLab%2FWCF.git

Adjusted class hierachy for some rebuild data workers

Fixes #2760
---

diff --git a/wcfsetup/install/files/lib/system/worker/DatabaseConvertEncodingWorker.class.php b/wcfsetup/install/files/lib/system/worker/DatabaseConvertEncodingWorker.class.php
index e9a70e40b8..5d86779dc9 100644
--- a/wcfsetup/install/files/lib/system/worker/DatabaseConvertEncodingWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/DatabaseConvertEncodingWorker.class.php
@@ -7,11 +7,11 @@ use wcf\system\WCF;
  * Worker implementation for database table encoding conversion.
  * 
  * @author	Alexander Ebert
- * @copyright	2001-2018 WoltLab GmbH
+ * @copyright	2001-2019 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	WoltLabSuite\Core\System\Worker
  */
-class DatabaseConvertEncodingWorker extends AbstractWorker {
+class DatabaseConvertEncodingWorker extends AbstractRebuildDataWorker {
 	/**
 	 * @inheritDoc
 	 */
diff --git a/wcfsetup/install/files/lib/system/worker/IRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/IRebuildDataWorker.class.php
index 297747bdd3..7b793e3150 100644
--- a/wcfsetup/install/files/lib/system/worker/IRebuildDataWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/IRebuildDataWorker.class.php
@@ -1,11 +1,12 @@
 <?php
 namespace wcf\system\worker;
+use wcf\data\DatabaseObjectList;
 
 /**
  * Every rebuild data worker has to implement this interface.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2018 WoltLab GmbH
+ * @copyright	2001-2019 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	WoltLabSuite\Core\System\Worker
  */
@@ -13,7 +14,7 @@ interface IRebuildDataWorker extends IWorker {
 	/**
 	 * Returns the list of objects.
 	 * 
-	 * @return	\wcf\data\DatabaseObjectList
+	 * @return DatabaseObjectList|null
 	 */
 	public function getObjectList();
 }
diff --git a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
index c589e42b01..f23545848a 100755
--- a/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
@@ -19,12 +19,12 @@ use wcf\util\MessageUtil;
  * Worker implementation for rebuilding all sitemaps.
  *
  * @author	Joshua Ruesweg
- * @copyright	2001-2018 WoltLab GmbH
+ * @copyright	2001-2019 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	WoltLabSuite\Core\System\Worker
  * @since	3.1
  */
-class SitemapRebuildWorker extends AbstractWorker {
+class SitemapRebuildWorker extends AbstractRebuildDataWorker {
 	/**
 	 * The limit of objects in one sitemap file.
 	 */
@@ -62,7 +62,7 @@ class SitemapRebuildWorker extends AbstractWorker {
 	/**
 	 * @inheritDoc
 	 */
-	protected function countObjects() {
+	public function countObjects() {
 		// changes session owner to 'System' during the building of sitemaps
 		$this->changeUserToGuest();