From 9a9ac8b55fecd34839f0873f581b5f11232eff19 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Wed, 22 Jul 2020 01:49:40 +0000 Subject: [PATCH] [AUTOGENERATED] Update autogenerated code --- src/Entity/ConfirmAddress.php | 6 +- src/Entity/Group.php | 44 +++--- src/Entity/Invitation.php | 22 +-- src/Entity/LocalGroup.php | 12 +- src/Entity/User.php | 262 ---------------------------------- 5 files changed, 40 insertions(+), 306 deletions(-) delete mode 100644 src/Entity/User.php diff --git a/src/Entity/ConfirmAddress.php b/src/Entity/ConfirmAddress.php index fab179e107..3de01bcabb 100644 --- a/src/Entity/ConfirmAddress.php +++ b/src/Entity/ConfirmAddress.php @@ -45,7 +45,7 @@ class ConfirmAddress private ?string $address_extra; private string $address_type; private ?\DateTimeInterface $claimed; - private ?\DateTimeInterface $sent; + private \DateTimeInterface $sent; private \DateTimeInterface $modified; public function setCode(string $code): self @@ -108,12 +108,12 @@ class ConfirmAddress return $this->claimed; } - public function setSent(?DateTimeInterface $sent): self + public function setSent(DateTimeInterface $sent): self { $this->sent = $sent; return $this; } - public function getSent(): ?DateTimeInterface + public function getSent(): DateTimeInterface { return $this->sent; } diff --git a/src/Entity/Group.php b/src/Entity/Group.php index 37fc5a4ac7..84791e83ea 100644 --- a/src/Entity/Group.php +++ b/src/Entity/Group.php @@ -51,12 +51,12 @@ class Group private ?string $homepage_logo; private ?string $stream_logo; private ?string $mini_logo; - private \DateTimeInterface $created; - private \DateTimeInterface $modified; private ?string $uri; private ?string $mainpage; private ?int $join_policy; private ?int $force_scope; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { @@ -178,26 +178,6 @@ class Group return $this->mini_logo; } - public function setCreated(DateTimeInterface $created): self - { - $this->created = $created; - return $this; - } - public function getCreated(): DateTimeInterface - { - return $this->created; - } - - public function setModified(DateTimeInterface $modified): self - { - $this->modified = $modified; - return $this; - } - public function getModified(): DateTimeInterface - { - return $this->modified; - } - public function setUri(?string $uri): self { $this->uri = $uri; @@ -238,6 +218,26 @@ class Group return $this->force_scope; } + public function setCreated(DateTimeInterface $created): self + { + $this->created = $created; + return $this; + } + public function getCreated(): DateTimeInterface + { + return $this->created; + } + + public function setModified(DateTimeInterface $modified): self + { + $this->modified = $modified; + return $this; + } + public function getModified(): DateTimeInterface + { + return $this->modified; + } + // }}} Autocode public static function schemaDef(): array diff --git a/src/Entity/Invitation.php b/src/Entity/Invitation.php index 584ae5f965..d018ccd128 100644 --- a/src/Entity/Invitation.php +++ b/src/Entity/Invitation.php @@ -43,8 +43,8 @@ class Invitation private int $user_id; private string $address; private string $address_type; - private \DateTimeInterface $created; private ?int $registered_user_id; + private \DateTimeInterface $created; public function setCode(string $code): self { @@ -86,16 +86,6 @@ class Invitation return $this->address_type; } - public function setCreated(DateTimeInterface $created): self - { - $this->created = $created; - return $this; - } - public function getCreated(): DateTimeInterface - { - return $this->created; - } - public function setRegisteredUserId(?int $registered_user_id): self { $this->registered_user_id = $registered_user_id; @@ -106,6 +96,16 @@ class Invitation return $this->registered_user_id; } + public function setCreated(DateTimeInterface $created): self + { + $this->created = $created; + return $this; + } + public function getCreated(): DateTimeInterface + { + return $this->created; + } + // }}} Autocode public static function schemaDef(): array diff --git a/src/Entity/LocalGroup.php b/src/Entity/LocalGroup.php index 640558cea4..dacb5b7890 100644 --- a/src/Entity/LocalGroup.php +++ b/src/Entity/LocalGroup.php @@ -41,15 +41,14 @@ class LocalGroup private int $group_id; private ?string $nickname; - private DateTimeInterface $created; - private DateTimeInterface $modified; + private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setGroupId(int $group_id): self { $this->group_id = $group_id; return $this; } - public function getGroupId(): int { return $this->group_id; @@ -60,7 +59,6 @@ class LocalGroup $this->nickname = $nickname; return $this; } - public function getNickname(): ?string { return $this->nickname; @@ -71,7 +69,6 @@ class LocalGroup $this->created = $created; return $this; } - public function getCreated(): DateTimeInterface { return $this->created; @@ -82,7 +79,6 @@ class LocalGroup $this->modified = $modified; return $this; } - public function getModified(): DateTimeInterface { return $this->modified; @@ -98,7 +94,7 @@ class LocalGroup 'fields' => [ 'group_id' => ['type' => 'int', 'not null' => true, 'description' => 'group represented'], 'nickname' => ['type' => 'varchar', 'length' => 64, 'description' => 'group represented'], - 'created' => ['type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'], + 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], 'modified' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], ], 'primary key' => ['group_id'], @@ -110,4 +106,4 @@ class LocalGroup ], ]; } -} \ No newline at end of file +} diff --git a/src/Entity/User.php b/src/Entity/User.php deleted file mode 100644 index b6c7466e9f..0000000000 --- a/src/Entity/User.php +++ /dev/null @@ -1,262 +0,0 @@ -. -// }}} - -namespace App\Entity; - -use DateTimeInterface; - -/** - * Entity for users - * - * @category DB - * @package GNUsocial - * - * @author Zach Copley - * @copyright 2010 StatusNet Inc. - * @author Mikael Nordfeldth - * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org - * @author Hugo Sales - * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ -class User -{ - // {{{ Autocode - - private int $id; - private ?string $nickname; - private ?string $password; - private ?string $outgoing_email; - private ?string $incoming_email; - private ?string $language; - private ?string $timezone; - private ?string $sms_phone_number; - private ?int $sms_carrier; - private ?string $sms_email; - private ?string $uri; - private ?bool $auto_follow_back; - private ?int $follow_policy; - private ?bool $is_stream_private; - private \DateTimeInterface $created; - private \DateTimeInterface $modified; - - public function setId(int $id): self - { - $this->id = $id; - return $this; - } - public function getId(): int - { - return $this->id; - } - - public function setNickname(?string $nickname): self - { - $this->nickname = $nickname; - return $this; - } - public function getNickname(): ?string - { - return $this->nickname; - } - - public function setPassword(?string $password): self - { - $this->password = $password; - return $this; - } - public function getPassword(): ?string - { - return $this->password; - } - - public function setOutgoingEmail(?string $outgoing_email): self - { - $this->outgoing_email = $outgoing_email; - return $this; - } - public function getOutgoingEmail(): ?string - { - return $this->outgoing_email; - } - - public function setIncomingEmail(?string $incoming_email): self - { - $this->incoming_email = $incoming_email; - return $this; - } - public function getIncomingEmail(): ?string - { - return $this->incoming_email; - } - - public function setLanguage(?string $language): self - { - $this->language = $language; - return $this; - } - public function getLanguage(): ?string - { - return $this->language; - } - - public function setTimezone(?string $timezone): self - { - $this->timezone = $timezone; - return $this; - } - public function getTimezone(): ?string - { - return $this->timezone; - } - - public function setSmsPhoneNumber(?string $sms_phone_number): self - { - $this->sms_phone_number = $sms_phone_number; - return $this; - } - public function getSmsPhoneNumber(): ?string - { - return $this->sms_phone_number; - } - - public function setSmsCarrier(?int $sms_carrier): self - { - $this->sms_carrier = $sms_carrier; - return $this; - } - public function getSmsCarrier(): ?int - { - return $this->sms_carrier; - } - - public function setSmsEmail(?string $sms_email): self - { - $this->sms_email = $sms_email; - return $this; - } - public function getSmsEmail(): ?string - { - return $this->sms_email; - } - - public function setUri(?string $uri): self - { - $this->uri = $uri; - return $this; - } - public function getUri(): ?string - { - return $this->uri; - } - - public function setAutoFollowBack(?bool $auto_follow_back): self - { - $this->auto_follow_back = $auto_follow_back; - return $this; - } - public function getAutoFollowBack(): ?bool - { - return $this->auto_follow_back; - } - - public function setFollowPolicy(?int $follow_policy): self - { - $this->follow_policy = $follow_policy; - return $this; - } - public function getFollowPolicy(): ?int - { - return $this->follow_policy; - } - - public function setIsStreamPrivate(?bool $is_stream_private): self - { - $this->is_stream_private = $is_stream_private; - return $this; - } - public function getIsStreamPrivate(): ?bool - { - return $this->is_stream_private; - } - - public function setCreated(DateTimeInterface $created): self - { - $this->created = $created; - return $this; - } - public function getCreated(): DateTimeInterface - { - return $this->created; - } - - public function setModified(DateTimeInterface $modified): self - { - $this->modified = $modified; - return $this; - } - public function getModified(): DateTimeInterface - { - return $this->modified; - } - - // }}} Autocode - - public static function schemaDef(): array - { - return [ - 'name' => 'user', - 'description' => 'local users', - 'fields' => [ - 'id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'], - 'nickname' => ['type' => 'varchar', 'length' => 64, 'description' => 'nickname or username, duped in profile'], - 'password' => ['type' => 'varchar', 'length' => 191, 'description' => 'salted password, can be null for OpenID users'], - 'outgoing_email' => ['type' => 'varchar', 'length' => 191, 'description' => 'email address for password recovery, notifications, etc.'], - 'incoming_email' => ['type' => 'varchar', 'length' => 191, 'description' => 'email address for post-by-email'], - 'language' => ['type' => 'varchar', 'length' => 50, 'description' => 'preferred language'], - 'timezone' => ['type' => 'varchar', 'length' => 50, 'description' => 'timezone'], - 'sms_phone_number' => ['type' => 'varchar', 'length' => 64, 'description' => 'sms phone number'], - 'sms_carrier' => ['type' => 'int', 'description' => 'foreign key to sms_carrier'], - 'sms_email' => ['type' => 'varchar', 'length' => 191, 'description' => 'built from sms and carrier (see sms_carrier)'], - 'uri' => ['type' => 'varchar', 'length' => 191, 'description' => 'universally unique identifier, usually a tag URI'], - 'auto_follow_back' => ['type' => 'bool', 'default' => false, 'description' => 'automatically follow users who follow us'], - 'follow_policy' => ['type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can follow; 1 = require approval'], - 'is_stream_private' => ['type' => 'bool', 'default' => false, 'description' => 'whether to limit all notices to followers only'], - 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], - 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], - ], - 'primary key' => ['id'], - 'unique keys' => [ - 'user_nickname_key' => ['nickname'], - 'user_outgoing_email_key' => ['outgoing_email'], - 'user_incoming_email_key' => ['incoming_email'], - 'user_sms_key' => ['sms_phone_number'], - 'user_uri_key' => ['uri'], - ], - 'foreign keys' => [ - 'user_id_fkey' => ['profile', ['id' => 'id']], - 'user_carrier_fkey' => ['sms_carrier', ['sms_carrier' => 'id']], - ], - 'indexes' => [ - 'user_created_idx' => ['created'], - 'user_sms_email_idx' => ['sms_email'], - ], - ]; - } -}