From 26e502ba0950a3176d9fb43a96d7f2e8256c9f5c Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 10 Mar 2019 11:01:50 +0100
Subject: [PATCH] Fix location and namespace of object type form node
 interface/trait

See #2509
---
 .../{field => }/IObjectTypeFormNode.class.php    |  2 +-
 .../{field => }/TObjectTypeFormNode.class.php    |  2 +-
 .../wysiwyg/WysiwygPreviewFormButton.class.php   |  4 ++--
 .../wysiwyg/WysiwygFormContainer.class.php       |  2 +-
 .../wysiwyg/WysiwygPollFormContainer.class.php   |  4 ++--
 .../builder/field/CaptchaFormField.class.php     |  2 ++
 .../builder/field/acl/AclFormField.class.php     |  4 ++--
 .../builder/field/tag/TagFormField.class.php     |  4 ++--
 .../field/wysiwyg/WysiwygFormField.class.php     | 16 ++++++----------
 9 files changed, 19 insertions(+), 21 deletions(-)
 rename wcfsetup/install/files/lib/system/form/builder/{field => }/IObjectTypeFormNode.class.php (96%)
 rename wcfsetup/install/files/lib/system/form/builder/{field => }/TObjectTypeFormNode.class.php (98%)

diff --git a/wcfsetup/install/files/lib/system/form/builder/field/IObjectTypeFormNode.class.php b/wcfsetup/install/files/lib/system/form/builder/IObjectTypeFormNode.class.php
similarity index 96%
rename from wcfsetup/install/files/lib/system/form/builder/field/IObjectTypeFormNode.class.php
rename to wcfsetup/install/files/lib/system/form/builder/IObjectTypeFormNode.class.php
index e43b7cdf9c..98420c585b 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/IObjectTypeFormNode.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/IObjectTypeFormNode.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace wcf\system\form\builder\field;
+namespace wcf\system\form\builder;
 use wcf\data\object\type\ObjectType;
 use wcf\system\exception\InvalidObjectTypeException;
 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/TObjectTypeFormNode.class.php b/wcfsetup/install/files/lib/system/form/builder/TObjectTypeFormNode.class.php
similarity index 98%
rename from wcfsetup/install/files/lib/system/form/builder/field/TObjectTypeFormNode.class.php
rename to wcfsetup/install/files/lib/system/form/builder/TObjectTypeFormNode.class.php
index 3de1d3837a..90d28c9661 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/TObjectTypeFormNode.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/TObjectTypeFormNode.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace wcf\system\form\builder\field;
+namespace wcf\system\form\builder;
 use wcf\data\object\type\ObjectType;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\system\exception\InvalidObjectTypeException;
diff --git a/wcfsetup/install/files/lib/system/form/builder/button/wysiwyg/WysiwygPreviewFormButton.class.php b/wcfsetup/install/files/lib/system/form/builder/button/wysiwyg/WysiwygPreviewFormButton.class.php
index ce960c089e..212aaa4081 100644
--- a/wcfsetup/install/files/lib/system/form/builder/button/wysiwyg/WysiwygPreviewFormButton.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/button/wysiwyg/WysiwygPreviewFormButton.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\form\builder\button\wysiwyg;
 use wcf\system\form\builder\button\FormButton;
-use wcf\system\form\builder\field\IObjectTypeFormNode;
-use wcf\system\form\builder\field\TObjectTypeFormNode;
+use wcf\system\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\form\builder\TWysiwygFormNode;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
index bc36751a65..553ef12e6a 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
@@ -104,7 +104,7 @@ class WysiwygFormContainer extends FormContainer {
 	
 	/**
 	 * actual wysiwyg form field
-	 * @var	WysiwygFormNode
+	 * @var	WysiwygFormField
 	 */
 	protected $wysiwygField;
 	
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
index e658c460db..b1695cd3ab 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
@@ -8,13 +8,13 @@ use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\data\processor\CustomFormFieldDataProcessor;
 use wcf\system\form\builder\field\DateFormField;
 use wcf\system\form\builder\field\IntegerFormField;
-use wcf\system\form\builder\field\IObjectTypeFormNode;
 use wcf\system\form\builder\field\poll\PollOptionsFormField;
 use wcf\system\form\builder\field\TextFormField;
-use wcf\system\form\builder\field\TObjectTypeFormNode;
 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\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\form\builder\TWysiwygFormNode;
 use wcf\system\poll\IPollHandler;
 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
index 735e9fc9b7..c3f111ac7c 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/CaptchaFormField.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\system\form\builder\field;
 use wcf\system\captcha\ICaptchaHandler;
+use wcf\system\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 
 /**
  * Implementation of a form field for a captcha.
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
index 02a6e5424d..d2d88bf9df 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
@@ -4,9 +4,9 @@ use wcf\data\IStorableObject;
 use wcf\system\acl\ACLHandler;
 use wcf\system\form\builder\field\AbstractFormField;
 use wcf\system\form\builder\field\data\processor\CustomFormFieldDataProcessor;
-use wcf\system\form\builder\field\IObjectTypeFormNode;
-use wcf\system\form\builder\field\TObjectTypeFormNode;
 use wcf\system\form\builder\IFormDocument;
+use wcf\system\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 
 /**
  * Implementation of a form field for setting acl option values.
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
index e8b6de0d4d..25be285577 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/tag/TagFormField.class.php
@@ -4,10 +4,10 @@ use wcf\data\tag\Tag;
 use wcf\data\IStorableObject;
 use wcf\system\form\builder\field\AbstractFormField;
 use wcf\system\form\builder\field\data\processor\CustomFormFieldDataProcessor;
-use wcf\system\form\builder\field\IObjectTypeFormNode;
 use wcf\system\form\builder\field\TDefaultIdFormField;
-use wcf\system\form\builder\field\TObjectTypeFormNode;
 use wcf\system\form\builder\IFormDocument;
+use wcf\system\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\tagging\TagEngine;
 use wcf\util\ArrayUtil;
 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
index 097cb009cc..3779037b85 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygFormField.class.php
@@ -4,12 +4,12 @@ use wcf\system\form\builder\field\AbstractFormField;
 use wcf\system\form\builder\field\data\processor\CustomFormFieldDataProcessor;
 use wcf\system\form\builder\field\IMaximumLengthFormField;
 use wcf\system\form\builder\field\IMinimumLengthFormField;
-use wcf\system\form\builder\field\IObjectTypeFormNode;
 use wcf\system\form\builder\field\TMaximumLengthFormField;
 use wcf\system\form\builder\field\TMinimumLengthFormField;
-use wcf\system\form\builder\field\TObjectTypeFormNode;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\IFormDocument;
+use wcf\system\form\builder\IObjectTypeFormNode;
+use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\html\input\HtmlInputProcessor;
 use wcf\util\StringUtil;
 
@@ -66,8 +66,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	 * Sets the identifier used to autosave the field value and returns this field.
 	 * 
 	 * @param	string		$autosaveId	identifier used to autosave field value
-	 *
-	 * @return        WysiwygFormNode		this field
+	 * @return	WysiwygFormField		this field
 	 */
 	public function autosaveId($autosaveId) {
 		$this->autosaveId = $autosaveId;
@@ -113,8 +112,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	 * Sets the last time this field has been edited and returns this field.
 	 * 
 	 * @param	int	$lastEditTime	last time field has been edited
-	 *
-	 * @return        WysiwygFormNode	this field
+	 * @return	WysiwygFormField	this field
 	 */
 	public function lastEditTime($lastEditTime) {
 		$this->lastEditTime = $lastEditTime;
@@ -158,8 +156,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	 * Sets if the form field supports attachments and returns this field.
 	 * 
 	 * @param	boolean		$supportAttachments
-	 *
-	 * @return        WysiwygFormNode
+	 * @return	WysiwygFormField		this field
 	 */
 	public function supportAttachments($supportAttachments = true) {
 		$this->supportAttachments = $supportAttachments;
@@ -171,8 +168,7 @@ class WysiwygFormField extends AbstractFormField implements IMaximumLengthFormFi
 	 * Sets if the form field supports mentions and returns this field.
 	 * 
 	 * @param	boolean		$supportMentions
-	 *
-	 * @return        WysiwygFormNode
+	 * @return	WysiwygFormField		this field
 	 */
 	public function supportMentions($supportMentions = true) {
 		$this->supportMentions = $supportMentions;
-- 
2.20.1