Travis fixes

diff --git a/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
index 5e07c2e9508b5021bf00f61ac61175b0019784af..30f2c36438984ecb5a6a843f94af69cde7f5fb31 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\menu\MenuAction;
 use wcf\data\menu\Menu;
+use wcf\data\menu\MenuAction;
 use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\language\I18nHandler;

diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
index a3b343d9efe26ca0e5f1bf0e2b89d8c08fc54dc7..112709a532014c7bf9447de3b554fb883bdfe338 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
@@ -1,18 +1,18 @@
 <?php
 namespace wcf\acp\form;
+use wcf\data\menu\item\MenuItem;
+use wcf\data\menu\item\MenuItemAction;
+use wcf\data\menu\item\MenuItemEditor;
+use wcf\data\menu\item\MenuItemNodeTree;
+use wcf\data\menu\Menu;
+use wcf\data\page\Page;
+use wcf\data\page\PageNodeTree;
 use wcf\form\AbstractForm;
+use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
-use wcf\data\menu\Menu;
-use wcf\system\exception\IllegalLinkException;
-use wcf\data\menu\item\MenuItemNodeTree;
-use wcf\data\page\Page;
-use wcf\data\menu\item\MenuItem;
-use wcf\data\menu\item\MenuItemAction;
-use wcf\data\menu\item\MenuItemEditor;
-use wcf\data\page\PageNodeTree;
 
 /**
  * Shows the menu item add form.
@@ -91,7 +91,7 @@ class MenuItemAddForm extends AbstractForm {
        
        /**
         * menu item node tree
-        * @var wcf\data\menu\item\MenuItemNodeTree
+        * @var MenuItemNodeTree
         */
        public $menuItems = null;
        

diff --git a/wcfsetup/install/files/lib/data/menu/MenuAction.class.php b/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
index f4d45e41ef6ed398e4db635bae0eade7800566cb..dd1ebbcf3094d0ff28b0c50d3903385c60c2b7f4 100644 (file)
--- a/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
@@ -17,7 +17,7 @@ class MenuAction extends AbstractDatabaseObjectAction {
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$className
         */
-       protected $className = 'wcf\data\menu\MenuEditor';
+       protected $className = MenuEditor::class;
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
@@ -26,12 +26,12 @@ class MenuAction extends AbstractDatabaseObjectAction {
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
-       */
+        */
        protected $permissionsDelete = array('admin.content.cms.canManageMenu');
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
-       */
+        */
        protected $permissionsUpdate = array('admin.content.cms.canManageMenu');
        
        /**

diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
index f48b2bd9926d94d15ef65130c147e00c4d6b3d7e..dab0d40cfb4a35e6163b99fc2dbdafcfbc24e648 100644 (file)
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
@@ -18,7 +18,7 @@ class MenuItemAction extends AbstractDatabaseObjectAction implements IToggleActi
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$className
         */
-       protected $className = 'wcf\data\menu\item\MenuItemEditor';
+       protected $className = MenuItemEditor::class;
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
@@ -27,12 +27,12 @@ class MenuItemAction extends AbstractDatabaseObjectAction implements IToggleActi
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
-       */
+        */
        protected $permissionsDelete = array('admin.content.cms.canManageMenu');
        
        /**
         * @see \wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
-       */
+        */
        protected $permissionsUpdate = array('admin.content.cms.canManageMenu');
        
        /**