Merge branch 'master' into vortex

# Conflicts: # files/lib/data/todo/ToDo.class.php # files/lib/form/TodoAddForm.class.php # files/lib/page/AbstractTodoListPage.class.php # install.sql # package.xml # update.sql
MysteryCode · Aug 3, 2017 · 6ccbd59 · 6ccbd59
2 parents 43b5759 + d478346
commit 6ccbd59
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,8 @@ php:
   - 7.1
   - 5.5
 before_install:
-  - pear install pear/PHP_CodeSniffer
+  - export PATH="$PATH:$(composer global config bin-dir --absolute)"
+  - composer global require "squizlabs/php_codesniffer=3.*"
   - phpenv rehash
 before_script:
   - git clone --branch=master --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF

diff --git a/files/lib/data/todo/category/TodoCategoryCache.class.php b/files/lib/data/todo/category/TodoCategoryCache.class.php
@@ -8,8 +8,8 @@
 use wcf\system\cache\builder\TodoCategoryLabelGroupCacheBuilder;
 use wcf\system\category\CategoryHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\label\LabelHandler;
 use wcf\system\label\object\TodoLabelObjectHandler;
+use wcf\system\label\LabelHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 
@@ -228,7 +228,7 @@ public function getLabelGroupIDs($categoryID = null) {
 			return $this->cachedLabelGroups[$categoryID];
 		}
 
-		return [];
+		return array();
 	}
 
 	/**

diff --git a/files/lib/form/TodoAddForm.class.php b/files/lib/form/TodoAddForm.class.php
@@ -16,8 +16,8 @@
 use wcf\system\exception\UserInputException;
 use wcf\system\html\input\HtmlInputProcessor;
 use wcf\system\message\censorship\Censorship;
-use wcf\system\label\LabelHandler;
 use wcf\system\label\object\TodoLabelObjectHandler;
+use wcf\system\label\LabelHandler;
 use wcf\system\message\quote\MessageQuoteManager;
 use wcf\system\user\notification\object\ToDoUserNotificationObject;
 use wcf\system\user\notification\UserNotificationHandler;

diff --git a/files/lib/form/TodoEditForm.class.php b/files/lib/form/TodoEditForm.class.php
@@ -85,7 +85,6 @@ public function save() {
 		TodoLabelObjectHandler::getInstance()->setLabels($this->labelIDs, $this->todoID);
 		$labelIDs = TodoLabelObjectHandler::getInstance()->getAssignedLabels(array($this->todoID), false);
 
-
 		if ($this->todo->canEdit()) {
 			$todoData = [
 				'data' => [

diff --git a/files/lib/page/AbstractTodoListPage.class.php b/files/lib/page/AbstractTodoListPage.class.php
@@ -3,7 +3,7 @@
 namespace wcf\page;
 use wcf\data\todo\category\RestrictedTodoCategoryNodeList;
 use wcf\data\todo\status\TodoStatusCache;
-use wcf\data\todo\ViewableToDoList;
+use wcf\data\todo\AccessibleToDoList;
 use wcf\data\user\group\UserGroupSearchAction;
 use wcf\data\user\UserProfile;
 use wcf\system\like\LikeHandler;
@@ -54,7 +54,7 @@ abstract class AbstractTodoListPage extends SortablePage {
 	/**
 	 * @inheritDoc
 	 */
-	public $objectListClassName = ViewableToDoList::class;
+	public $objectListClassName = AccessibleToDoList::class;
 
 	public $neededModules = ['TODOLIST'];