diff --git a/plugins/ActivityPub/Entity/ActivityPubActor.php b/plugins/ActivityPub/Entity/ActivityPubActor.php index 65753d7b72..03c5ae2fec 100644 --- a/plugins/ActivityPub/Entity/ActivityPubActor.php +++ b/plugins/ActivityPub/Entity/ActivityPubActor.php @@ -35,7 +35,6 @@ namespace Plugin\ActivityPub\Entity; class ActivityPubActor { // {{{ Autocode - private string $uri; private int $profile_id; private string $inboxuri; diff --git a/plugins/ActivityPub/Entity/ActivityPubCryptKey.php b/plugins/ActivityPub/Entity/ActivityPubCryptKey.php index 50e4e2f5e4..7b8e39999c 100644 --- a/plugins/ActivityPub/Entity/ActivityPubCryptKey.php +++ b/plugins/ActivityPub/Entity/ActivityPubCryptKey.php @@ -35,20 +35,19 @@ namespace Plugin\ActivityPub\Entity; class ActivityPubCryptKey { // {{{ Autocode - private int $gsactor_id; private ?string $private_key; private string $public_key; private ?DateTimeInterface $created; private DateTimeInterface $modified; - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/plugins/ActivityPub/Entity/ActivityPubFollowRequests.php b/plugins/ActivityPub/Entity/ActivityPubFollowRequests.php index 93cde932a7..397c3f7e0a 100644 --- a/plugins/ActivityPub/Entity/ActivityPubFollowRequests.php +++ b/plugins/ActivityPub/Entity/ActivityPubFollowRequests.php @@ -35,29 +35,28 @@ namespace Plugin\ActivityPub\Entity; class ActivityPubFollowRequests { // {{{ Autocode - private int $local_gsactor_id; private int $remote_gsactor_id; private int $relation_id; - public function setLocalGsactorId(int $local_gsactor_id): self + public function setLocalGSActorId(int $local_gsactor_id): self { $this->local_gsactor_id = $local_gsactor_id; return $this; } - public function getLocalGsactorId(): int + public function getLocalGSActorId(): int { return $this->local_gsactor_id; } - public function setRemoteGsactorId(int $remote_gsactor_id): self + public function setRemoteGSActorId(int $remote_gsactor_id): self { $this->remote_gsactor_id = $remote_gsactor_id; return $this; } - public function getRemoteGsactorId(): int + public function getRemoteGSActorId(): int { return $this->remote_gsactor_id; } diff --git a/src/Entity/Activity.php b/src/Entity/Activity.php index 295a45c84d..c29d3f22aa 100644 --- a/src/Entity/Activity.php +++ b/src/Entity/Activity.php @@ -38,7 +38,6 @@ use DateTimeInterface; class Activity extends Entity { // {{{ Autocode - private int $id; private int $gsactor_id; private string $verb; @@ -59,13 +58,13 @@ class Activity extends Entity return $this->id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/Avatar.php b/src/Entity/Avatar.php index 6572dce37e..856959458e 100644 --- a/src/Entity/Avatar.php +++ b/src/Entity/Avatar.php @@ -44,19 +44,18 @@ use DateTimeInterface; class Avatar extends Entity { // {{{ Autocode - private int $gsactor_id; private int $file_id; private DateTimeInterface $created; private DateTimeInterface $modified; - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/ConfirmAddress.php b/src/Entity/ConfirmAddress.php index fe6d05493a..a1d51b5eb0 100644 --- a/src/Entity/ConfirmAddress.php +++ b/src/Entity/ConfirmAddress.php @@ -39,7 +39,6 @@ use DateTimeInterface; class ConfirmAddress extends Entity { // {{{ Autocode - private string $code; private ?int $user_id; private string $address; diff --git a/src/Entity/Conversation.php b/src/Entity/Conversation.php index a17fb0649b..fff1f40bb0 100644 --- a/src/Entity/Conversation.php +++ b/src/Entity/Conversation.php @@ -37,7 +37,6 @@ use DateTimeInterface; class Conversation extends Entity { // {{{ Autocode - private int $id; private int $note_id; private DateTimeInterface $created; diff --git a/src/Entity/Favourite.php b/src/Entity/Favourite.php index f429e13dbd..cba911489c 100644 --- a/src/Entity/Favourite.php +++ b/src/Entity/Favourite.php @@ -25,7 +25,6 @@ use DateTimeInterface; class Favourite extends Entity { // {{{ Autocode - private int $note_id; private int $gsactor_id; private DateTimeInterface $created; @@ -42,13 +41,13 @@ class Favourite extends Entity return $this->note_id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } @@ -74,6 +73,7 @@ class Favourite extends Entity { return $this->modified; } + // }}} Autocode public static function schemaDef() diff --git a/src/Entity/File.php b/src/Entity/File.php index 07777dac32..e603cd8f4c 100644 --- a/src/Entity/File.php +++ b/src/Entity/File.php @@ -40,7 +40,6 @@ use DateTimeInterface; class File extends Entity { // {{{ Autocode - private int $id; private ?string $url; private ?string $url_hash; diff --git a/src/Entity/FileThumbnail.php b/src/Entity/FileThumbnail.php index d4eee197cb..d14c4cd8f7 100644 --- a/src/Entity/FileThumbnail.php +++ b/src/Entity/FileThumbnail.php @@ -39,7 +39,6 @@ use DateTimeInterface; class FileThumbnail extends Entity { // {{{ Autocode - private int $file_id; private int $width; private int $height; diff --git a/src/Entity/FileToNote.php b/src/Entity/FileToNote.php index 996cce0ff1..c0e56f31f2 100644 --- a/src/Entity/FileToNote.php +++ b/src/Entity/FileToNote.php @@ -39,7 +39,6 @@ use DateTimeInterface; class FileToNote extends Entity { // {{{ Autocode - private int $file_id; private int $note_id; private DateTimeInterface $modified; diff --git a/src/Entity/Follow.php b/src/Entity/Follow.php index 46d29416b9..3c653879da 100644 --- a/src/Entity/Follow.php +++ b/src/Entity/Follow.php @@ -39,7 +39,6 @@ use DateTimeInterface; class Follow extends Entity { // {{{ Autocode ->>>>>>> e63aa4d971 ([TOOLS] Change autocode tag to allow editor folding) private int $follower; private int $followed; diff --git a/src/Entity/FollowQueue.php b/src/Entity/FollowQueue.php index 7088df8edf..23dae94b6c 100644 --- a/src/Entity/FollowQueue.php +++ b/src/Entity/FollowQueue.php @@ -39,7 +39,6 @@ use DateTimeInterface; class FollowQueue extends Entity { // {{{ Autocode - private int $follower; private int $followed; private DateTimeInterface $created; diff --git a/src/Entity/GSActor.php b/src/Entity/GSActor.php index 7b6dac81fa..a75f6773d1 100644 --- a/src/Entity/GSActor.php +++ b/src/Entity/GSActor.php @@ -45,7 +45,6 @@ use Functional as F; class GSActor extends Entity { // {{{ Autocode - private int $id; private string $nickname; private ?string $fullname; diff --git a/src/Entity/GSActorBlock.php b/src/Entity/GSActorBlock.php index d10b29dc8c..7cb73186df 100644 --- a/src/Entity/GSActorBlock.php +++ b/src/Entity/GSActorBlock.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GSActorBlock extends Entity { // {{{ Autocode - private int $blocker; private int $blocked; private DateTimeInterface $modified; diff --git a/src/Entity/GSActorCircle.php b/src/Entity/GSActorCircle.php index 6dc4eb1e23..3a2ff8dbf8 100644 --- a/src/Entity/GSActorCircle.php +++ b/src/Entity/GSActorCircle.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GSActorCircle extends Entity { // {{{ Autocode - private int $id; private int $tagger; private string $tag; diff --git a/src/Entity/GSActorTag.php b/src/Entity/GSActorTag.php index 0fa4045188..865d340747 100644 --- a/src/Entity/GSActorTag.php +++ b/src/Entity/GSActorTag.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GSActorTag extends Entity { // {{{ Autocode - private int $tagger; private int $tagged; private string $tag; diff --git a/src/Entity/GSActorTagFollow.php b/src/Entity/GSActorTagFollow.php index b463209ee0..499bbc3937 100644 --- a/src/Entity/GSActorTagFollow.php +++ b/src/Entity/GSActorTagFollow.php @@ -39,30 +39,29 @@ use DateTimeInterface; class GSActorTagFollow extends Entity { // {{{ Autocode - private int $gsactor_tag_id; private int $gsactor_id; private DateTimeInterface $created; private DateTimeInterface $modified; - public function setGsactorTagId(int $gsactor_tag_id): self + public function setGSActorTagId(int $gsactor_tag_id): self { $this->gsactor_tag_id = $gsactor_tag_id; return $this; } - public function getGsactorTagId(): int + public function getGSActorTagId(): int { return $this->gsactor_tag_id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/Group.php b/src/Entity/Group.php index 1d3463bcc9..685739c403 100644 --- a/src/Entity/Group.php +++ b/src/Entity/Group.php @@ -39,7 +39,6 @@ use DateTimeInterface; class Group extends Entity { // {{{ Autocode - private int $id; private int $gsactor_id; private ?string $nickname; @@ -70,13 +69,13 @@ class Group extends Entity return $this->id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/GroupAlias.php b/src/Entity/GroupAlias.php index 5958a7f2f8..50330dfbae 100644 --- a/src/Entity/GroupAlias.php +++ b/src/Entity/GroupAlias.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GroupAlias extends Entity { // {{{ Autocode - private string $alias; private int $group_id; private DateTimeInterface $modified; diff --git a/src/Entity/GroupBlock.php b/src/Entity/GroupBlock.php index 8687e1de42..2eb781b66f 100644 --- a/src/Entity/GroupBlock.php +++ b/src/Entity/GroupBlock.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GroupBlock extends Entity { // {{{ Autocode - private int $group_id; private int $blocked_gsactor; private int $blocker_user; @@ -56,13 +55,13 @@ class GroupBlock extends Entity return $this->group_id; } - public function setBlockedGsactor(int $blocked_gsactor): self + public function setBlockedGSActor(int $blocked_gsactor): self { $this->blocked_gsactor = $blocked_gsactor; return $this; } - public function getBlockedGsactor(): int + public function getBlockedGSActor(): int { return $this->blocked_gsactor; } diff --git a/src/Entity/GroupInbox.php b/src/Entity/GroupInbox.php index f4133fa957..4e4b5814d0 100644 --- a/src/Entity/GroupInbox.php +++ b/src/Entity/GroupInbox.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GroupInbox extends Entity { // {{{ Autocode - private int $group_id; private int $activity_id; private DateTimeInterface $created; diff --git a/src/Entity/GroupJoinQueue.php b/src/Entity/GroupJoinQueue.php index 865fa80c8b..98b864a1bd 100644 --- a/src/Entity/GroupJoinQueue.php +++ b/src/Entity/GroupJoinQueue.php @@ -39,18 +39,17 @@ use DateTimeInterface; class GroupJoinQueue extends Entity { // {{{ Autocode - private int $gsactor_id; private int $group_id; private DateTimeInterface $created; - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/GroupMember.php b/src/Entity/GroupMember.php index ce9687de79..d719d8f1d3 100644 --- a/src/Entity/GroupMember.php +++ b/src/Entity/GroupMember.php @@ -39,7 +39,6 @@ use DateTimeInterface; class GroupMember extends Entity { // {{{ Autocode - private int $group_id; private int $gsactor_id; private ?bool $is_admin; @@ -58,13 +57,13 @@ class GroupMember extends Entity return $this->group_id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/Invitation.php b/src/Entity/Invitation.php index e14408b69d..f5fca1d6b8 100644 --- a/src/Entity/Invitation.php +++ b/src/Entity/Invitation.php @@ -39,7 +39,6 @@ use DateTimeInterface; class Invitation extends Entity { // {{{ Autocode - private string $code; private int $user_id; private string $address; diff --git a/src/Entity/LocalGroup.php b/src/Entity/LocalGroup.php index 697db35f50..9d5eaceddc 100644 --- a/src/Entity/LocalGroup.php +++ b/src/Entity/LocalGroup.php @@ -39,7 +39,6 @@ use DateTimeInterface; class LocalGroup extends Entity { // {{{ Autocode - private int $group_id; private ?string $nickname; private DateTimeInterface $created; diff --git a/src/Entity/LocalUser.php b/src/Entity/LocalUser.php index 980953460b..9f2602e212 100644 --- a/src/Entity/LocalUser.php +++ b/src/Entity/LocalUser.php @@ -47,7 +47,6 @@ use Symfony\Component\Security\Core\User\UserInterface; class LocalUser extends Entity implements UserInterface { // {{{ Autocode - private int $id; private string $nickname; private ?string $password; diff --git a/src/Entity/LocationService.php b/src/Entity/LocationService.php index 0f69fd8c7a..94f0ebe1b3 100644 --- a/src/Entity/LocationService.php +++ b/src/Entity/LocationService.php @@ -39,7 +39,6 @@ use DateTimeInterface; class LocationService extends Entity { // {{{ Autocode - private int $id; private ?string $description; private DateTimeInterface $created; diff --git a/src/Entity/Note.php b/src/Entity/Note.php index 257260a1b8..dd6f2c95f8 100644 --- a/src/Entity/Note.php +++ b/src/Entity/Note.php @@ -41,7 +41,6 @@ use DateTimeInterface; class Note extends Entity { // {{{ Autocode - private int $id; private int $gsactor_id; private ?string $content; @@ -66,13 +65,13 @@ class Note extends Entity return $this->id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/NoteHashtag.php b/src/Entity/NoteHashtag.php index be6f90e389..811ac9b6bb 100644 --- a/src/Entity/NoteHashtag.php +++ b/src/Entity/NoteHashtag.php @@ -39,7 +39,6 @@ use DateTimeInterface; class NoteHashtag extends Entity { // {{{ Autocode - private string $tag; private int $note_id; private DateTimeInterface $created; diff --git a/src/Entity/NoteLocation.php b/src/Entity/NoteLocation.php index 5ddd10fd05..3eaac71145 100644 --- a/src/Entity/NoteLocation.php +++ b/src/Entity/NoteLocation.php @@ -39,7 +39,6 @@ use DateTimeInterface; class NoteLocation extends Entity { // {{{ Autocode - private int $note_id; private ?float $lat; private ?float $lon; diff --git a/src/Entity/NoteSource.php b/src/Entity/NoteSource.php index cace309bb3..af3ade22e8 100644 --- a/src/Entity/NoteSource.php +++ b/src/Entity/NoteSource.php @@ -39,7 +39,6 @@ use DateTimeInterface; class NoteSource extends Entity { // {{{ Autocode - private string $code; private string $name; private string $url; diff --git a/src/Entity/Notification.php b/src/Entity/Notification.php index e7f741a9ed..87f72fa770 100644 --- a/src/Entity/Notification.php +++ b/src/Entity/Notification.php @@ -39,7 +39,6 @@ use DateTimeInterface; class Notification extends Entity { // {{{ Autocode - private int $activity_id; private int $gsactor_id; private ?string $reason; @@ -57,13 +56,13 @@ class Notification extends Entity return $this->activity_id; } - public function setGsactorId(int $gsactor_id): self + public function setGSActorId(int $gsactor_id): self { $this->gsactor_id = $gsactor_id; return $this; } - public function getGsactorId(): int + public function getGSActorId(): int { return $this->gsactor_id; } diff --git a/src/Entity/RelatedGroup.php b/src/Entity/RelatedGroup.php index 6a27d67fd8..07060c2d70 100644 --- a/src/Entity/RelatedGroup.php +++ b/src/Entity/RelatedGroup.php @@ -39,7 +39,6 @@ use DateTimeInterface; class RelatedGroup extends Entity { // {{{ Autocode - private int $group_id; private int $related_group_id; private DateTimeInterface $created; diff --git a/src/Entity/RememberMeToken.php b/src/Entity/RememberMeToken.php index f23cdb4ce2..e54ba98131 100644 --- a/src/Entity/RememberMeToken.php +++ b/src/Entity/RememberMeToken.php @@ -37,7 +37,6 @@ use DateTimeInterface; class RememberMeToken extends Entity { // {{{ Autocode - private string $series; private string $value; private DateTimeInterface $lastUsed; diff --git a/src/Entity/ReservedNickname.php b/src/Entity/ReservedNickname.php index 4c3058e0e2..39fb00b57e 100644 --- a/src/Entity/ReservedNickname.php +++ b/src/Entity/ReservedNickname.php @@ -39,7 +39,6 @@ use DateTimeInterface; class ReservedNickname extends Entity { // {{{ Autocode - private string $nickname; private DateTimeInterface $created; diff --git a/src/Entity/SmsCarrier.php b/src/Entity/SmsCarrier.php index 711a509347..c7ca9d8db5 100644 --- a/src/Entity/SmsCarrier.php +++ b/src/Entity/SmsCarrier.php @@ -39,7 +39,6 @@ use DateTimeInterface; class SmsCarrier extends Entity { // {{{ Autocode - private int $id; private ?string $name; private string $email_pattern; diff --git a/src/Entity/UserLocationPrefs.php b/src/Entity/UserLocationPrefs.php index 93fe52b01e..05a02bab46 100644 --- a/src/Entity/UserLocationPrefs.php +++ b/src/Entity/UserLocationPrefs.php @@ -37,7 +37,6 @@ use DateTimeInterface; class UserLocationPrefs extends Entity { // {{{ Autocode - private int $user_id; private ?bool $share_location; private DateTimeInterface $created; diff --git a/src/Entity/UserNotificationPrefs.php b/src/Entity/UserNotificationPrefs.php index ab60941c33..58a7fc0f8f 100644 --- a/src/Entity/UserNotificationPrefs.php +++ b/src/Entity/UserNotificationPrefs.php @@ -35,7 +35,6 @@ use DateTimeInterface; class UserNotificationPrefs extends Entity { // {{{ Autocode - private int $user_id; private string $transport; private ?int $target_gsactor_id; @@ -73,13 +72,13 @@ class UserNotificationPrefs extends Entity return $this->transport; } - public function setTargetGsactorId(?int $target_gsactor_id): self + public function setTargetGSActorId(?int $target_gsactor_id): self { $this->target_gsactor_id = $target_gsactor_id; return $this; } - public function getTargetGsactorId(): ?int + public function getTargetGSActorId(): ?int { return $this->target_gsactor_id; } diff --git a/src/Entity/UserUrlShortenerPrefs.php b/src/Entity/UserUrlShortenerPrefs.php index 383c41bef0..a06558448e 100644 --- a/src/Entity/UserUrlShortenerPrefs.php +++ b/src/Entity/UserUrlShortenerPrefs.php @@ -39,7 +39,6 @@ use DateTimeInterface; class UserUrlShortenerPrefs extends Entity { // {{{ Autocode - private int $user_id; private ?string $url_shortening_service; private int $max_url_length;