From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 27 Jul 2018 13:36:48 +0000 (+0200)
Subject: Merge branch 'formBuilder' into pipGui
X-Git-Tag: 5.2.0_Alpha_1~685
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7412caf08682f436bea798502f5828099dbc5ecd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'formBuilder' into pipGui
---

7412caf08682f436bea798502f5828099dbc5ecd
diff --cc wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php
index 974376cbd9,728a6b1329..ac9b0a3c6a
--- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php
+++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php
@@@ -1,9 -1,6 +1,8 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\data\acp\menu\item;
  use wcf\data\DatabaseObjectEditor;
 +use wcf\data\IEditableCachedObject;
 +use wcf\system\cache\builder\ACPMenuCacheBuilder;
  
  /**
   * Provides functions to edit ACP menu items.
diff --cc wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php
index 5f096342c6,21bd220694..4d1451b131
--- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php
+++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php
@@@ -1,7 -1,5 +1,6 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\data\acp\template;
 +use wcf\data\package\PackageCache;
  use wcf\data\DatabaseObject;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
index 58a6322909,8c97a5ee06..a450f413ed
--- a/wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
@@@ -1,24 -1,8 +1,23 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
 +use wcf\data\acl\option\ACLOption;
  use wcf\data\acl\option\ACLOptionEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\acl\option\ACLOptionList;
 +use wcf\data\acl\option\category\ACLOptionCategory;
 +use wcf\data\acl\option\category\ACLOptionCategoryEditor;
 +use wcf\data\acl\option\category\ACLOptionCategoryList;
 +use wcf\data\object\type\ObjectTypeCache;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
  use wcf\system\exception\SystemException;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\IFormDocument;
  use wcf\system\WCF;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
index 172d793e59,29ed7ea44a..3782a6f97c
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
@@@ -1,17 -1,6 +1,16 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\acp\menu\item\ACPMenuItemEditor;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\IFormContainer;
 +use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 +use wcf\system\form\builder\field\IconFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\validation\FormFieldValidatorUtil;
 +use wcf\system\form\builder\IFormDocument;
  
  /**
   * Installs, updates and deletes ACP menu items.
diff --cc wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
index 3feb3ab649,d4e3a2c4f5..c507530edb
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
@@@ -1,20 -1,8 +1,19 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\acp\search\provider\ACPSearchProviderEditor;
 +use wcf\data\acp\search\provider\ACPSearchProviderList;
  use wcf\system\cache\builder\ACPSearchProviderCacheBuilder;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\IntegerFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\search\acp\IACPSearchResultProvider;
  use wcf\system\WCF;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
index 8bd346e5a3,1d81f0eed9..026cc5eecd
--- a/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
@@@ -1,26 -1,9 +1,25 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
 +use wcf\data\acp\menu\item\ACPMenuItem;
 +use wcf\data\DatabaseObjectList;
 +use wcf\page\IPage;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
  use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
  use wcf\system\exception\SystemException;
 +use wcf\system\form\builder\container\IFormContainer;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\IntegerFormField;
 +use wcf\system\form\builder\field\OptionFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\field\UserGroupOptionFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\IFormDocument;
  use wcf\system\WCF;
  use wcf\util\StringUtil;
 +use wcf\util\Url;
  
  /**
   * Abstract implementation of a package installation plugin for menu items.
diff --cc wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
index 5ce39cde38,02cf9aabd8..3eefb01fc0
--- a/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
@@@ -1,18 -1,8 +1,17 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\core\object\CoreObjectEditor;
 +use wcf\data\core\object\CoreObjectList;
  use wcf\system\cache\builder\CoreObjectCacheBuilder;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\SingletonFactory;
  use wcf\system\WCF;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
index e515682e57,6aee79562b..0c32aa9c03
--- a/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
@@@ -1,21 -1,8 +1,20 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\bbcode\media\provider\BBCodeMediaProviderEditor;
 +use wcf\system\bbcode\media\provider\IBBCodeMediaProvider;
  use wcf\system\cache\builder\BBCodeMediaProviderCacheBuilder;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\MultilineTextFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\field\TitleFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\Regex;
  use wcf\system\WCF;
  use wcf\util\StringUtil;
  
diff --cc wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
index 2728d5fa54,7228e99a70..f085907e70
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
@@@ -1,16 -1,7 +1,15 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\object\type\definition\ObjectTypeDefinitionEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\object\type\ObjectTypeCache;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
  use wcf\system\WCF;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index a670181d12,24e1cca27a..2d38fae813
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@@ -1,39 -1,9 +1,38 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
 +use wcf\data\object\type\definition\ObjectTypeDefinitionList;
 +use wcf\data\object\type\ObjectTypeCache;
  use wcf\data\object\type\ObjectTypeEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\DatabaseObjectList;
 +use wcf\system\application\ApplicationHandler;
 +use wcf\system\condition\AbstractIntegerCondition;
 +use wcf\system\condition\UserGroupCondition;
 +use wcf\system\condition\UserIntegerPropertyCondition;
 +use wcf\system\condition\UserTimestampPropertyCondition;
 +use wcf\system\devtools\pip\DevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\event\EventHandler;
  use wcf\system\exception\SystemException;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\container\IFormContainer;
 +use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 +use wcf\system\form\builder\field\OptionFormField;
 +use wcf\system\form\builder\field\UserGroupOptionFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\BooleanFormField;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\FloatFormField;
 +use wcf\system\form\builder\field\IntegerFormField;
 +use wcf\system\form\builder\field\ItemListFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\Regex;
  use wcf\system\WCF;
 +use wcf\util\DirectoryUtil;
  
  /**
   * Installs, updates and deletes object types.
diff --cc wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
index c5b1e98d2e,446229a119..d1ccb33cc8
--- a/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
@@@ -1,17 -1,7 +1,16 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\package\installation\plugin\PackageInstallationPluginEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\package\installation\plugin\PackageInstallationPluginList;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
  use wcf\system\WCF;
  
  /**
diff --cc wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index a34bc23743,d8789b6afa..6790e0bdfd
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@@ -1,24 -1,8 +1,23 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
 +use wcf\data\acp\template\ACPTemplate;
 +use wcf\data\acp\template\ACPTemplateList;
  use wcf\data\template\listener\TemplateListenerEditor;
 +use wcf\data\template\listener\TemplateListenerList;
 +use wcf\data\template\Template;
 +use wcf\data\template\TemplateList;
  use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\MultilineTextFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
  use wcf\system\WCF;
  use wcf\util\StringUtil;
  
diff --cc wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
index 1529d617fe,acfbabfbb3..f03d663e75
--- a/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
@@@ -1,17 -1,6 +1,16 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\user\menu\item\UserMenuItemEditor;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\IFormContainer;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 +use wcf\system\form\builder\field\IconFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidatorUtil;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\menu\user\IUserMenuItemProvider;
  
  /**
   * Installs, updates and deletes user menu items.
diff --cc wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
index 07abbe635c,c9f3f9a06d..3491295bd0
--- a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
@@@ -1,26 -1,9 +1,25 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
 +use wcf\data\object\type\ObjectTypeCache;
  use wcf\data\user\notification\event\UserNotificationEvent;
  use wcf\data\user\notification\event\UserNotificationEventEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\user\notification\event\UserNotificationEventList;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
  use wcf\system\exception\SystemException;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\OptionFormField;
 +use wcf\system\form\builder\field\UserGroupOptionFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\BooleanFormField;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\ItemListFormField;
 +use wcf\system\form\builder\field\SingleSelectionFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\user\notification\event\IUserNotificationEvent;
  use wcf\system\WCF;
  use wcf\util\StringUtil;
  
diff --cc wcfsetup/install/files/lib/system/package/plugin/UserProfileMenuPackageInstallationPlugin.class.php
index dbc609a20b,f21c879881..275a1f6d4d
--- a/wcfsetup/install/files/lib/system/package/plugin/UserProfileMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserProfileMenuPackageInstallationPlugin.class.php
@@@ -1,22 -1,7 +1,21 @@@
  <?php
- declare(strict_types=1);
  namespace wcf\system\package\plugin;
  use wcf\data\user\profile\menu\item\UserProfileMenuItemEditor;
 -use wcf\system\devtools\pip\IIdempotentPackageInstallationPlugin;
 +use wcf\data\user\profile\menu\item\UserProfileMenuItemList;
 +use wcf\system\devtools\pip\IDevtoolsPipEntryList;
 +use wcf\system\devtools\pip\IGuiPackageInstallationPlugin;
 +use wcf\system\devtools\pip\TXmlGuiPackageInstallationPlugin;
 +use wcf\system\form\builder\container\FormContainer;
 +use wcf\system\form\builder\field\OptionFormField;
 +use wcf\system\form\builder\field\UserGroupOptionFormField;
 +use wcf\system\form\builder\field\validation\FormFieldValidationError;
 +use wcf\system\form\builder\field\validation\FormFieldValidator;
 +use wcf\system\form\builder\field\ClassNameFormField;
 +use wcf\system\form\builder\field\IntegerFormField;
 +use wcf\system\form\builder\field\ItemListFormField;
 +use wcf\system\form\builder\field\TextFormField;
 +use wcf\system\form\builder\IFormDocument;
 +use wcf\system\menu\user\profile\content\IUserProfileMenuContent;
  use wcf\system\WCF;
  use wcf\util\StringUtil;