Merge branch 'formBuilder' into pipGui

diff --cc wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php
index 974376cbd9b5a879bd198d20ca57a9347d9d3779,728a6b13295292248c15a18b1f9b0ce6e64187ae..ac9b0a3c6a892e8ef8c09e30dfe1b7f82d49df00
--- 1/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItemEditor.class.php
--- 2/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 5f096342c6e3312622b4af012757d43f4b9931b0,21bd2206940161cba8cd0726acee42d584a4768f..4d1451b131fb68b150235ee8204eb3dda8895436
--- 1/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php
--- 2/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/data/devtools/project/DevtoolsProject.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/package/Package.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPackageInstallationDispatcher.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/devtools/pip/DevtoolsPip.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
index 58a6322909ee524e3d13d4888ba810c04b43f770,8c97a5ee06c5bbd9faab970ed80294653d68d88b..a450f413ed6c7f64b99a600981b4ff7cf092072c
--- 1/wcfsetup/install/files/lib/system/package/plugin/ACLOptionPackageInstallationPlugin.class.php
--- 2/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 172d793e5992a0c9e1712d2df343131eb7938e1a,29ed7ea44a3bdbd0d3961e02ff472dc7d8ac309e..3782a6f97cd4dcac49f57a2166bbe0430e040c6e
--- 1/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
--- 2/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 3feb3ab649efa9e2761c1e21a4d6892a78dcdea1,d4e3a2c4f5f556156290d161d9ee212380434271..c507530edb0265d6572f5b276da0dd0730512e06
--- 1/wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
--- 2/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 8bd346e5a3ef160e5c0d3fc129d24bbc410e36c4,1d81f0eed92b2202f23adcb91b5e295bc8f1c9f3..026cc5eecd1fb998c54b4ef6c3288a92036d5d31
--- 1/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
--- 2/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/AbstractXMLPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/ClipboardActionPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
index 5ce39cde380d05276febfb91528480b512475f2a,02cf9aabd8b4031cc92f02a47ab4a8242999ce1a..3eefb01fc09901b7b2f9e200fbdb617d0475e05e
--- 1/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
--- 2/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/CronjobPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
index e515682e572e78d8b38897519412c182ac24a952,6aee79562b769d6041664d500bc533287c04c0ff..0c32aa9c033b2d1a6a1efe224337ffe351d1376b
--- 1/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
--- 2/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/MenuItemPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
index 2728d5fa5406680f72562daf570c8bea6978a97f,7228e99a70ac88b1a7206929a8350b3acd7fe323..f085907e7040a1c71edf6c62db2c85586aa0013b
--- 1/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
--- 2/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 a670181d125af4a921e148d3827560e3ccec4d2c,24e1cca27a08b179ab3865fa5dc7e4e08fef07ca..2d38fae813a0ed61a8b3816aed64ab28dfaaa2b6
--- 1/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
--- 2/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 c5b1e98d2e6fdb4a418eaf45eec593115bf74fd5,446229a11909ff8b6ac5de3a4e0ed07a189a8e20..d1ccb33cc8d48cb8d485959223d22aead61dfb18
--- 1/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
--- 2/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/PagePackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index a34bc23743858ac85cb768a08c562a5f4aba66d7,d8789b6afa74d2902166acd850abda57dc07b36c..6790e0bdfd492835626ba33228238e5c612035d0
--- 1/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
--- 2/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 1529d617fe756684bdce7992449e84a3ed1eab20,acfbabfbb3a4597105aa26a25e48b0088ae4db22..f03d663e75189fd8d3651a6dc90cb8803159043e
--- 1/wcfsetup/install/files/lib/system/package/plugin/UserMenuPackageInstallationPlugin.class.php
--- 2/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 07abbe635ce37827d434edbac4281c1e6c419a2b,c9f3f9a06df80a4c7d5ab3fee7e57dadf638d02b..3491295bd0d66f902f9708ad134a5bc70c9a0b7a
--- 1/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
--- 2/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 dbc609a20b56399a80fe77890d861bac27582281,f21c879881cd57b35f894c239b96a00771dcdd2c..275a1f6d4d5b1546f81189fffb0f02ee5818bf6f
--- 1/wcfsetup/install/files/lib/system/package/plugin/UserProfileMenuPackageInstallationPlugin.class.php
--- 2/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;
  

diff --cc wcfsetup/install/files/lib/util/CronjobUtil.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/util/XML.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/util/XMLWriter.class.php
Simple merge