diff --git a/src/Entity/Config.php b/src/Entity/Config.php
index 94779441a5..42eda3f6b5 100644
--- a/src/Entity/Config.php
+++ b/src/Entity/Config.php
@@ -19,6 +19,8 @@
namespace App\Entity;
+use App\Core\Entity;
+
/**
* Entity for app configuration
*
@@ -33,7 +35,7 @@ namespace App\Entity;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Config
+class Config extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/ConfirmAddress.php b/src/Entity/ConfirmAddress.php
index e3f9f563a7..c8cdfc2951 100644
--- a/src/Entity/ConfirmAddress.php
+++ b/src/Entity/ConfirmAddress.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class ConfirmAddress
+class ConfirmAddress extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/Conversation.php b/src/Entity/Conversation.php
index 14d355980a..a17fb0649b 100644
--- a/src/Entity/Conversation.php
+++ b/src/Entity/Conversation.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -33,7 +34,7 @@ use DateTimeInterface;
* @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Conversation
+class Conversation extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/FileThumbnail.php b/src/Entity/FileThumbnail.php
index 59c624ecf1..e321ee94b1 100644
--- a/src/Entity/FileThumbnail.php
+++ b/src/Entity/FileThumbnail.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class FileThumbnail
+class FileThumbnail extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/FileToActivity.php b/src/Entity/FileToNote.php
similarity index 98%
rename from src/Entity/FileToActivity.php
rename to src/Entity/FileToNote.php
index 9549cb3049..23d3b6287d 100644
--- a/src/Entity/FileToActivity.php
+++ b/src/Entity/FileToNote.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class FileToActivity
+class FileToNote extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/Follow.php b/src/Entity/Follow.php
index e69a301934..57dc690add 100644
--- a/src/Entity/Follow.php
+++ b/src/Entity/Follow.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Follow
+class Follow extends Entity
{
// {{{ Autocode
>>>>>>> e63aa4d971 ([TOOLS] Change autocode tag to allow editor folding)
diff --git a/src/Entity/FollowQueue.php b/src/Entity/FollowQueue.php
index 7d2377f6eb..5d510cccc2 100644
--- a/src/Entity/FollowQueue.php
+++ b/src/Entity/FollowQueue.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class FollowQueue
+class FollowQueue extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GSActorBlock.php b/src/Entity/GSActorBlock.php
index b3c0a49001..f735b013c4 100644
--- a/src/Entity/GSActorBlock.php
+++ b/src/Entity/GSActorBlock.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GSActorBlock
+class GSActorBlock extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GSActorCircle.php b/src/Entity/GSActorCircle.php
index 1e2c61cd2a..df73e5b095 100644
--- a/src/Entity/GSActorCircle.php
+++ b/src/Entity/GSActorCircle.php
@@ -17,6 +17,11 @@
// along with GNU social. If not, see .
// }}}
+namespace App\Entity;
+
+use App\Core\Entity;
+use DateTimeInterface;
+
/**
* Entity for List of gsactors
*
@@ -31,12 +36,7 @@
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-
-namespace App\Entity;
-
-use DateTimeInterface;
-
-class GSActorCircle
+class GSActorCircle extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GSActorTagFollow.php b/src/Entity/GSActorTagFollow.php
index e7c749a1f1..b1b6044ab9 100644
--- a/src/Entity/GSActorTagFollow.php
+++ b/src/Entity/GSActorTagFollow.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GSActorTagFollow
+class GSActorTagFollow extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/Group.php b/src/Entity/Group.php
index 92672a76d5..e44636db51 100644
--- a/src/Entity/Group.php
+++ b/src/Entity/Group.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Group
+class Group extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GroupAlias.php b/src/Entity/GroupAlias.php
index 7569982ab6..514290b436 100644
--- a/src/Entity/GroupAlias.php
+++ b/src/Entity/GroupAlias.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GroupAlias
+class GroupAlias extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GroupBlock.php b/src/Entity/GroupBlock.php
index c469caa4dd..a127567953 100644
--- a/src/Entity/GroupBlock.php
+++ b/src/Entity/GroupBlock.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GroupBlock
+class GroupBlock extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GroupInbox.php b/src/Entity/GroupInbox.php
index 9c8a1e43a5..037b5bf5d6 100644
--- a/src/Entity/GroupInbox.php
+++ b/src/Entity/GroupInbox.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GroupInbox
+class GroupInbox extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GroupJoinQueue.php b/src/Entity/GroupJoinQueue.php
index 0112ab0ac1..e914846fe0 100644
--- a/src/Entity/GroupJoinQueue.php
+++ b/src/Entity/GroupJoinQueue.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GroupJoinQueue
+class GroupJoinQueue extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/GroupMember.php b/src/Entity/GroupMember.php
index a01e70a1c5..5e4cb4cf5a 100644
--- a/src/Entity/GroupMember.php
+++ b/src/Entity/GroupMember.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class GroupMember
+class GroupMember extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/Invitation.php b/src/Entity/Invitation.php
index cc03858dc0..4f63745d6b 100644
--- a/src/Entity/Invitation.php
+++ b/src/Entity/Invitation.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Invitation
+class Invitation extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/LocalGroup.php b/src/Entity/LocalGroup.php
index f629484d13..532cb688a5 100644
--- a/src/Entity/LocalGroup.php
+++ b/src/Entity/LocalGroup.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class LocalGroup
+class LocalGroup extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/LocationService.php b/src/Entity/LocationService.php
index 4cabe5601d..3650e43a22 100644
--- a/src/Entity/LocationService.php
+++ b/src/Entity/LocationService.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class LocationService
+class LocationService extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/NoteHashtag.php b/src/Entity/NoteHashtag.php
index 05a3c77b89..fc978fbf5d 100644
--- a/src/Entity/NoteHashtag.php
+++ b/src/Entity/NoteHashtag.php
@@ -17,6 +17,11 @@
// along with GNU social. If not, see .
// }}}
+namespace App\Entity;
+
+use App\Core\Entity;
+use DateTimeInterface;
+
/**
* Entity for Notice Tag
*
@@ -31,12 +36,7 @@
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-
-namespace App\Entity;
-
-use DateTimeInterface;
-
-class NoteHashtag
+class NoteHashtag extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/NoteLocation.php b/src/Entity/NoteLocation.php
index fe4da2c16a..367b09b0d9 100644
--- a/src/Entity/NoteLocation.php
+++ b/src/Entity/NoteLocation.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class NoteLocation
+class NoteLocation extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/NoteSource.php b/src/Entity/NoteSource.php
index 82bcc53b1a..b19d4600bb 100644
--- a/src/Entity/NoteSource.php
+++ b/src/Entity/NoteSource.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class NoteSource
+class NoteSource extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/Notification.php b/src/Entity/Notification.php
index 6d44c3782c..00c260d64e 100644
--- a/src/Entity/Notification.php
+++ b/src/Entity/Notification.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class Notification
+class Notification extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/RelatedGroup.php b/src/Entity/RelatedGroup.php
index 35bf764309..974a7645b3 100644
--- a/src/Entity/RelatedGroup.php
+++ b/src/Entity/RelatedGroup.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class RelatedGroup
+class RelatedGroup extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/RememberMeToken.php b/src/Entity/RememberMeToken.php
index dea9f6ed4f..857a2dfdd6 100644
--- a/src/Entity/RememberMeToken.php
+++ b/src/Entity/RememberMeToken.php
@@ -21,6 +21,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -33,7 +34,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class RememberMeToken
+class RememberMeToken extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/ReservedNickname.php b/src/Entity/ReservedNickname.php
index fd7ca30d25..249b9de86b 100644
--- a/src/Entity/ReservedNickname.php
+++ b/src/Entity/ReservedNickname.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class ReservedNickname
+class ReservedNickname extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/SmsCarrier.php b/src/Entity/SmsCarrier.php
index 942251dccc..14ed93acbb 100644
--- a/src/Entity/SmsCarrier.php
+++ b/src/Entity/SmsCarrier.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class SmsCarrier
+class SmsCarrier extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/UserLocationPrefs.php b/src/Entity/UserLocationPrefs.php
index 2076c4e629..4f5b96578a 100644
--- a/src/Entity/UserLocationPrefs.php
+++ b/src/Entity/UserLocationPrefs.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -33,7 +34,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class UserLocationPrefs
+class UserLocationPrefs extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/UserNotificationPrefs.php b/src/Entity/UserNotificationPrefs.php
index 5129735cb0..fea9c703ca 100644
--- a/src/Entity/UserNotificationPrefs.php
+++ b/src/Entity/UserNotificationPrefs.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -31,7 +32,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class UserNotificationPrefs
+class UserNotificationPrefs extends Entity
{
// {{{ Autocode
diff --git a/src/Entity/UserUrlShortenerPrefs.php b/src/Entity/UserUrlShortenerPrefs.php
index 7bcf982b81..bf6bd76c7c 100644
--- a/src/Entity/UserUrlShortenerPrefs.php
+++ b/src/Entity/UserUrlShortenerPrefs.php
@@ -19,6 +19,7 @@
namespace App\Entity;
+use App\Core\Entity;
use DateTimeInterface;
/**
@@ -35,7 +36,7 @@ use DateTimeInterface;
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
-class UserUrlShortenerPrefs
+class UserUrlShortenerPrefs extends Entity
{
// {{{ Autocode