make things compatible to WSC 5.4

mutec · mutec · commit cf05955db64e · 2021-07-16T11:06:37.000+02:00
diff --git a/README.md b/README.md
@@ -6,16 +6,17 @@ Sometimes you want to store some data serialzed as an array but you want to have
 The form builder introduced in WSC 5.2 is currently not able to handle this case properly, so there is some sort of workaround required. 
 
 Usage example:
+
 ```PHP
-use wcf\system\form\builder\container\DummyFormContainer;
+use wcf\system\form\builder\container\MCDummyFormContainer;
 use wcf\system\form\builder\container\FormContainer;
-use wcf\system\form\builder\data\processor\PrefixedFormDataProcessor;
-use wcf\system\form\builder\NestedFormDocument;
+use wcf\system\form\builder\data\processor\MCPrefixedFormDataProcessor;
+use wcf\system\form\builder\MCNestedFormDocument;
 use wcf\system\form\builder\field\TextFormField;
 
-$this->form = NestedFormDocument::create('DummyAdd');
+$this->form = MCNestedFormDocument::create('DummyAdd');
 $this->form->appendChildren([
-	DummyFormContainer::create('additionalData')
+	MCDummyFormContainer::create('additionalData')
         ->appendChildren([
             FormContainer::create('foo')
                 ->label('wcf.dummy.foo')
@@ -25,7 +26,7 @@ $this->form->appendChildren([
                 ])
         ])
     ]);
-$this->form->getDataHandler()->addProcessor(new PrefixedFormDataProcessor('additionalData', 'additionalData'));
+$this->form->getDataHandler()->addProcessor(new MCPrefixedFormDataProcessor('additionalData', 'additionalData'));
 ```
 
 ### Attention:
diff --git a/acptemplates/__mcPasswordFormField.tpl b/acptemplates/__mcPasswordFormField.tpl
diff --git a/acptemplates/__mcTextDisplayFormField.tpl b/acptemplates/__mcTextDisplayFormField.tpl
diff --git a/files/js/WoltLabSuite/Core/Form/Builder/Password.js b/files/js/WoltLabSuite/Core/Form/Builder/Password.js
diff --git a/files/lib/system/form/builder/MCNestedFormDocument.class.php b/files/lib/system/form/builder/MCNestedFormDocument.class.php
@@ -2,7 +2,7 @@
 
 namespace wcf\system\form\builder;
 
-class NestedFormDocument extends FormDocument {
+class MCNestedFormDocument extends FormDocument {
 	/**
 	 * @inheritDoc
 	 */
diff --git a/files/lib/system/form/builder/container/MCAttachmentFormContainer.class.php b/files/lib/system/form/builder/container/MCAttachmentFormContainer.class.php
@@ -6,12 +6,13 @@
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\system\attachment\AttachmentHandler;
 use wcf\system\event\EventHandler;
-use wcf\system\form\builder\field\AttachmentFormField;
+use wcf\system\form\builder\field\MCAttachmentFormField;
 
-class AttachmentFormContainer extends FormContainer {
+class MCAttachmentFormContainer extends FormContainer {
 	/**
 	 * attachment form field
-	 * @var	AttachmentFormField
+	 *
+	 * @var        MCAttachmentFormField
 	 */
 	protected $attachmentField;
 	
@@ -79,7 +80,7 @@ public function attachmentData($objectType = null, $parentObjectID = 0) {
 	/**
 	 * Returns the form field handling attachments.
 	 *
-	 * @return	AttachmentFormField
+	 * @return        MCAttachmentFormField
 	 * @throws	\BadMethodCallException		if the form field container has not been populated yet/form has not been built yet
 	 */
 	public function getAttachmentField() {
@@ -135,7 +136,7 @@ public function loadValues(array $data, IStorableObject $object) {
 	public function populate() {
 		parent::populate();
 		
-		$this->attachmentField = AttachmentFormField::create($this->fieldId);
+		$this->attachmentField = MCAttachmentFormField::create($this->fieldId);
 		
 		$this->appendChildren([
 			$this->attachmentField
diff --git a/files/lib/system/form/builder/container/MCDummyFormContainer.class.php b/files/lib/system/form/builder/container/MCDummyFormContainer.class.php
@@ -4,7 +4,7 @@
 
 use wcf\system\WCF;
 
-class DummyFormContainer extends FormContainer {
+class MCDummyFormContainer extends FormContainer {
 	/**
 	 * @inheritDoc
 	 */
diff --git a/files/lib/system/form/builder/container/MCRecurringElementsFormContainer.class.php b/files/lib/system/form/builder/container/MCRecurringElementsFormContainer.class.php
@@ -5,7 +5,7 @@
 use wcf\system\form\builder\data\processor\CustomFormDataProcessor;
 use wcf\system\form\builder\IFormDocument;
 
-class RecurringElementsFormContainer extends FormContainer {
+class MCRecurringElementsFormContainer extends FormContainer {
 	/**
 	 * @inheritDoc
 	 */
diff --git a/files/lib/system/form/builder/container/MCRegisterFormContainer.class.php b/files/lib/system/form/builder/container/MCRegisterFormContainer.class.php
@@ -2,7 +2,7 @@
 
 namespace wcf\system\form\builder\container;
 
-class RegisterFormContainer extends FormContainer {
+class MCRegisterFormContainer extends FormContainer {
 	/**
 	 * @inheritDoc
 	 */
diff --git a/files/lib/system/form/builder/data/processor/MCPrefixedFormDataProcessor.class.php b/files/lib/system/form/builder/data/processor/MCPrefixedFormDataProcessor.class.php
@@ -3,13 +3,13 @@
 namespace wcf\system\form\builder\data\processor;
 
 use wcf\data\IStorableObject;
-use wcf\system\form\builder\container\DummyFormContainer;
+use wcf\system\form\builder\container\MCDummyFormContainer;
 use wcf\system\form\builder\container\IFormContainer;
 use wcf\system\form\builder\field\IFormField;
 use wcf\system\form\builder\IFormDocument;
 use wcf\system\form\builder\IFormNode;
 
-class PrefixedFormDataProcessor extends AbstractFormDataProcessor {
+class MCPrefixedFormDataProcessor extends AbstractFormDataProcessor {
 	/**
 	 * processor id primarily used for error messages
 	 * @var	string
@@ -49,7 +49,7 @@ public function __construct($id, $wrapperProperty, $targetProperty = '') {
 	 * @inheritDoc
 	 */
 	public function processFormData(IFormDocument $document, array $parameters) {
-		/** @var DummyFormContainer $container */
+		/** @var MCDummyFormContainer $container */
 		$container = $document->getNodeById($this->id);
 		if ($container === null || !$container->hasChildren()) {
 			return $parameters;
@@ -88,7 +88,7 @@ protected function processNode(IFormNode $node, &$parameters) {
 	 * @inheritDoc
 	 */
 	public function processObjectData(IFormDocument $document, array $data, IStorableObject $object) {
-		/** @var DummyFormContainer $container */
+		/** @var MCDummyFormContainer $container */
 		$container = $document->getNodeById($this->id);
 		
 		$container = $document->getNodeById($this->id);
diff --git a/files/lib/system/form/builder/data/processor/MCRecurringElementsFormDataProcessor.class.php b/files/lib/system/form/builder/data/processor/MCRecurringElementsFormDataProcessor.class.php
@@ -5,7 +5,7 @@
 use wcf\data\IStorableObject;
 use wcf\system\form\builder\IFormDocument;
 
-class RecurringElementsFormDataProcessor extends AbstractFormDataProcessor {
+class MCRecurringElementsFormDataProcessor extends AbstractFormDataProcessor {
 	/**
 	 * processor id primarily used for error messages
 	 * @var	string
diff --git a/files/lib/system/form/builder/field/MCAttachmentFormField.class.php b/files/lib/system/form/builder/field/MCAttachmentFormField.class.php
@@ -8,7 +8,7 @@
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
-class AttachmentFormField extends AbstractFormField {
+class MCAttachmentFormField extends AbstractFormField {
 	/**
 	 * attachment handler
 	 * @var	null|AttachmentHandler
diff --git a/files/lib/system/form/builder/field/MCPasswordFormField.class.php b/files/lib/system/form/builder/field/MCPasswordFormField.class.php
@@ -16,7 +16,7 @@
  * @package	WoltLabSuite\Core\System\Form\Builder\Field
  * @since	5.2
  */
-class PasswordFormField extends AbstractFormField implements IAutoFocusFormField, IImmutableFormField, IMaximumLengthFormField, IMinimumLengthFormField, IPlaceholderFormField {
+class MCPasswordFormField extends AbstractFormField implements IAutoFocusFormField, IImmutableFormField, IMaximumLengthFormField, IMinimumLengthFormField, IPlaceholderFormField {
 	use TAutoFocusFormField;
 	use TImmutableFormField;
 	use TMaximumLengthFormField;
@@ -31,7 +31,7 @@ class PasswordFormField extends AbstractFormField implements IAutoFocusFormField
 	/**
 	 * @inheritDoc
 	 */
-	protected $templateName = '__passwordFormField';
+	protected $templateName = '__mcPasswordFormField';
 	
 	/**
 	 * @var integer
diff --git a/files/lib/system/form/builder/field/MCPreviewedUploadFormField.class.php b/files/lib/system/form/builder/field/MCPreviewedUploadFormField.class.php
@@ -16,7 +16,7 @@
  * @package WoltLabSuite\Core\System\Form\Builder\Field
  * @since   5.2
  */
-class PreviewedUploadFormField extends UploadFormField {
+class MCPreviewedUploadFormField extends UploadFormField {
 	/**
 	 * @inheritDoc
 	 *
diff --git a/files/lib/system/form/builder/field/MCTextDisplayFormField.class.php b/files/lib/system/form/builder/field/MCTextDisplayFormField.class.php
@@ -10,11 +10,11 @@
  * @package	WoltLabSuite\Core\System\Form\Builder\Field
  * @since	5.2
  */
-class TextDisplayFormField extends AbstractFormField {
+class MCTextDisplayFormField extends AbstractFormField {
 	/**
 	 * @inheritDoc
 	 */
-	protected $templateName = '__textDisplayFormField';
+	protected $templateName = '__mcTextDisplayFormField';
 	
 	/**
 	 * Displayed text
diff --git a/templates/__mcPasswordFormField.tpl b/templates/__mcPasswordFormField.tpl
diff --git a/templates/__mcTextDisplayFormField.tpl b/templates/__mcTextDisplayFormField.tpl
