From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 7 Dec 2017 13:57:35 +0000 (-0500)
Subject: Move Object\Profile to Model\Profile
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6b60b89385d98d179307e1066b36f2078e6bbaff;p=friendica.git

Move Object\Profile to Model\Profile
---

diff --git a/mod/profiles.php b/mod/profiles.php
index eca13bf10c..2ed0daff1c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,8 +10,8 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Object\Profile;
 
 function profiles_init(App $a) {
 
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
new file mode 100644
index 0000000000..0916e66c8d
--- /dev/null
+++ b/src/Model/Profile.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file src/Model/Profile.php
+ */
+
+namespace Friendica\Model;
+
+class Profile
+{
+	/**
+	 * @brief Returns a formatted location string from the given profile array
+	 *
+	 * @param array $profile Profile array (Generated from the "profile" table)
+	 *
+	 * @return string Location string
+	 */
+	public static function formatLocation(array $profile)
+	{
+		$location = '';
+
+		if ($profile['locality']) {
+			$location .= $profile['locality'];
+		}
+
+		if ($profile['region'] && ($profile['locality'] != $profile['region'])) {
+			if ($location) {
+				$location .= ', ';
+			}
+
+			$location .= $profile['region'];
+		}
+
+		if ($profile['country-name']) {
+			if ($location) {
+				$location .= ', ';
+			}
+
+			$location .= $profile['country-name'];
+		}
+
+		return $location;
+	}
+}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 500aa7323f..320bb43cc1 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -14,7 +14,7 @@ use Friendica\Core\System;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\Object\Profile;
+use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Util\XML;
 
diff --git a/src/Object/Profile.php b/src/Object/Profile.php
deleted file mode 100644
index 29925a9497..0000000000
--- a/src/Object/Profile.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file src/Object/Profile.php
- */
-
-namespace Friendica\Object;
-
-use Friendica\BaseObject;
-
-class Profile extends BaseObject
-{
-	/**
-	 * @brief Returns a formatted location string from the given profile array
-	 *
-	 * @param array $profile Profile array (Generated from the "profile" table)
-	 *
-	 * @return string Location string
-	 */
-	public static function formatLocation(array $profile)
-	{
-		$location = '';
-
-		if ($profile['locality']) {
-			$location .= $profile['locality'];
-		}
-
-		if ($profile['region'] && ($profile['locality'] != $profile['region'])) {
-			if ($location) {
-				$location .= ', ';
-			}
-
-			$location .= $profile['region'];
-		}
-
-		if ($profile['country-name']) {
-			if ($location) {
-				$location .= ', ';
-			}
-
-			$location .= $profile['country-name'];
-		}
-
-		return $location;
-	}
-}
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 2cb5eb700b..28989fb333 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -17,9 +17,9 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
-use Friendica\Object\Profile;
 use Friendica\Util\XML;
 
 use dba;
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 1cc43f718d..3e2defb2b7 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -13,8 +13,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Object\Profile;
 use dba;
 use DOMDocument;
 use DomXPath;