From 43da8a75a7862f499118407aa89b3965cd274cc3 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Thu, 3 Jan 2019 17:59:51 +0100
Subject: [PATCH] =?utf8?q?Move=20form=20builder=E2=80=99s=20data=20handler?=
 =?utf8?q?s=20into=20separate=20namespace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

See #2509
---
 .../files/lib/system/form/builder/FormDocument.class.php     | 2 ++
 .../files/lib/system/form/builder/IFormDocument.class.php    | 1 +
 .../system/form/builder/{ => data}/FormDataHandler.class.php | 5 +++--
 .../form/builder/{ => data}/IFormDataHandler.class.php       | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename wcfsetup/install/files/lib/system/form/builder/{ => data}/FormDataHandler.class.php (87%)
 rename wcfsetup/install/files/lib/system/form/builder/{ => data}/IFormDataHandler.class.php (88%)

diff --git a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
index 5467a4e16a..04646f84d7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/FormDocument.class.php
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\system\form\builder;
 use wcf\data\IStorableObject;
+use wcf\system\form\builder\data\FormDataHandler;
+use wcf\system\form\builder\data\IFormDataHandler;
 use wcf\system\form\builder\field\data\DefaultFormFieldDataProcessor;
 use wcf\system\form\builder\field\IFileFormField;
 use wcf\system\form\builder\field\IFormField;
diff --git a/wcfsetup/install/files/lib/system/form/builder/IFormDocument.class.php b/wcfsetup/install/files/lib/system/form/builder/IFormDocument.class.php
index 77e59dc66d..e3536fa107 100644
--- a/wcfsetup/install/files/lib/system/form/builder/IFormDocument.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/IFormDocument.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\form\builder;
 use wcf\data\IStorableObject;
+use wcf\system\form\builder\data\IFormDataHandler;
 
 /**
  * Represents a "whole" form (document).
diff --git a/wcfsetup/install/files/lib/system/form/builder/FormDataHandler.class.php b/wcfsetup/install/files/lib/system/form/builder/data/FormDataHandler.class.php
similarity index 87%
rename from wcfsetup/install/files/lib/system/form/builder/FormDataHandler.class.php
rename to wcfsetup/install/files/lib/system/form/builder/data/FormDataHandler.class.php
index be508a50a3..f75b4a40a7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/FormDataHandler.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/data/FormDataHandler.class.php
@@ -1,6 +1,7 @@
 <?php
-namespace wcf\system\form\builder;
+namespace wcf\system\form\builder\data;
 use wcf\system\form\builder\field\data\IFormFieldDataProcessor;
+use wcf\system\form\builder\IFormDocument;
 
 /**
  * Data processor implementation for form fields that populates or manipulates the
@@ -9,7 +10,7 @@ use wcf\system\form\builder\field\data\IFormFieldDataProcessor;
  * @author	Matthias Schmidt
  * @copyright	2001-2018 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core\System\Form\Builder\Field\Data
+ * @package	WoltLabSuite\Core\System\Form\Builder\Data
  * @since	3.2
  */
 class FormDataHandler implements IFormDataHandler {
diff --git a/wcfsetup/install/files/lib/system/form/builder/IFormDataHandler.class.php b/wcfsetup/install/files/lib/system/form/builder/data/IFormDataHandler.class.php
similarity index 88%
rename from wcfsetup/install/files/lib/system/form/builder/IFormDataHandler.class.php
rename to wcfsetup/install/files/lib/system/form/builder/data/IFormDataHandler.class.php
index d78280473d..6e98b5023e 100644
--- a/wcfsetup/install/files/lib/system/form/builder/IFormDataHandler.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/data/IFormDataHandler.class.php
@@ -1,6 +1,7 @@
 <?php
-namespace wcf\system\form\builder;
+namespace wcf\system\form\builder\data;
 use wcf\system\form\builder\field\data\IFormFieldDataProcessor;
+use wcf\system\form\builder\IFormDocument;
 
 /**
  * Represents a data handler that extracts the data of a form document into an array
@@ -9,7 +10,7 @@ use wcf\system\form\builder\field\data\IFormFieldDataProcessor;
  * @author	Matthias Schmidt
  * @copyright	2001-2018 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core\System\Form\Builder
+ * @package	WoltLabSuite\Core\System\Form\Builder\Data
  * @since	3.2
  */
 interface IFormDataHandler {
-- 
2.20.1