From 1c0f92c38232947b21dd736c56760e1378698211 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Fri, 8 Oct 2021 19:17:27 +0200
Subject: [PATCH] Move ProfileField from Model to Entity

---
 src/Factory/Api/Mastodon/Field.php             |  5 +++--
 src/Module/Settings/Profile/Index.php          |  2 +-
 .../ProfileField/Entity}/ProfileField.php      |  2 +-
 src/Repository/ProfileField.php                | 18 +++++++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)
 rename src/{Model => Profile/ProfileField/Entity}/ProfileField.php (98%)

diff --git a/src/Factory/Api/Mastodon/Field.php b/src/Factory/Api/Mastodon/Field.php
index 6ff63fb1bf..2e33022425 100644
--- a/src/Factory/Api/Mastodon/Field.php
+++ b/src/Factory/Api/Mastodon/Field.php
@@ -25,13 +25,14 @@ use Friendica\BaseFactory;
 use Friendica\Collection\Api\Mastodon\Fields;
 use Friendica\Collection\ProfileFields;
 use Friendica\Content\Text\BBCode;
-use Friendica\Model\ProfileField;
+use Friendica\Profile\ProfileField\Entity\ProfileField;
 use Friendica\Network\HTTPException;
 
 class Field extends BaseFactory
 {
 	/**
-	 * @param ProfileField $profileField
+	 * @param \Friendica\Profile\ProfileField\Entity\ProfileField $profileField
+	 *
 	 * @return \Friendica\Object\Api\Mastodon\Field
 	 * @throws HTTPException\InternalServerErrorException
 	 */
diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index c51393c984..a7b71851df 100644
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -30,7 +30,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Model\ProfileField;
+use Friendica\Profile\ProfileField\Entity\ProfileField;
 use Friendica\Model\User;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Security\Login;
diff --git a/src/Model/ProfileField.php b/src/Profile/ProfileField/Entity/ProfileField.php
similarity index 98%
rename from src/Model/ProfileField.php
rename to src/Profile/ProfileField/Entity/ProfileField.php
index c5905f934c..6703615b0b 100644
--- a/src/Model/ProfileField.php
+++ b/src/Profile/ProfileField/Entity/ProfileField.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Model;
+namespace Friendica\Profile\ProfileField\Entity;
 
 use Friendica\BaseModel;
 use Friendica\Database\Database;
diff --git a/src/Repository/ProfileField.php b/src/Repository/ProfileField.php
index 40417be486..75221933b3 100644
--- a/src/Repository/ProfileField.php
+++ b/src/Repository/ProfileField.php
@@ -36,7 +36,7 @@ class ProfileField extends BaseRepository
 {
 	protected static $table_name = 'profile_field';
 
-	protected static $model_class = Model\ProfileField::class;
+	protected static $model_class = \Friendica\Profile\ProfileField\Entity\ProfileField::class;
 
 	protected static $collection_class = Collection\ProfileFields::class;
 
@@ -58,7 +58,8 @@ class ProfileField extends BaseRepository
 
 	/**
 	 * @param array $data
-	 * @return Model\ProfileField
+	 *
+	 * @return \Friendica\Profile\ProfileField\Entity\ProfileField
 	 */
 	protected function create(array $data)
 	{
@@ -67,7 +68,8 @@ class ProfileField extends BaseRepository
 
 	/**
 	 * @param array $condition
-	 * @return Model\ProfileField
+	 *
+	 * @return \Friendica\Profile\ProfileField\Entity\ProfileField
 	 * @throws \Friendica\Network\HTTPException\NotFoundException
 	 */
 	public function selectFirst(array $condition)
@@ -138,7 +140,8 @@ class ProfileField extends BaseRepository
 
 	/**
 	 * @param array $fields
-	 * @return Model\ProfileField|bool
+	 *
+	 * @return \Friendica\Profile\ProfileField\Entity\ProfileField|bool
 	 * @throws \Exception
 	 */
 	public function insert(array $fields)
@@ -150,7 +153,8 @@ class ProfileField extends BaseRepository
 	}
 
 	/**
-	 * @param Model\ProfileField $model
+	 * @param \Friendica\Profile\ProfileField\Entity\ProfileField $model
+	 *
 	 * @return bool
 	 * @throws \Exception
 	 */
@@ -202,7 +206,7 @@ class ProfileField extends BaseRepository
 		unset($profileFieldOrder['new']);
 
 		// Prunes profile field whose label has been emptied
-		$profileFields = $profileFields->filter(function (Model\ProfileField $profileField) use (&$profileFieldInputs, &$profileFieldOrder) {
+		$profileFields = $profileFields->filter(function (\Friendica\Profile\ProfileField\Entity\ProfileField $profileField) use (&$profileFieldInputs, &$profileFieldOrder) {
 			$keepModel = !isset($profileFieldInputs[$profileField->id]) || !empty($profileFieldInputs[$profileField->id]['label']);
 
 			if (!$keepModel) {
@@ -218,7 +222,7 @@ class ProfileField extends BaseRepository
 		$profileFieldOrder = array_flip(array_keys($profileFieldOrder));
 
 		// Update existing profile fields from form values
-		$profileFields = $profileFields->map(function (Model\ProfileField $profileField) use ($uid, &$profileFieldInputs, &$profileFieldOrder) {
+		$profileFields = $profileFields->map(function (\Friendica\Profile\ProfileField\Entity\ProfileField $profileField) use ($uid, &$profileFieldInputs, &$profileFieldOrder) {
 			if (isset($profileFieldInputs[$profileField->id]) && isset($profileFieldOrder[$profileField->id])) {
 				$psid = $this->permissionSet->selectOrCreate($this->permissionSetFactory->createFromString(
 					$uid,