From 59eba851f7f8c3978851e53d0b77b9cbbbbb9786 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@fc.up.pt>
Date: Mon, 27 Jul 2020 03:36:34 +0000
Subject: [PATCH] [DATABASE][TOOLS] Update local_user to return the proper
 PhoneNumber type

---
 bin/generate_entity_fields |  2 +-
 src/Entity/LocalUser.php   | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/generate_entity_fields b/bin/generate_entity_fields
index 26213da734..9dcc6fc7f5 100755
--- a/bin/generate_entity_fields
+++ b/bin/generate_entity_fields
@@ -20,7 +20,7 @@ const types = [
     'serial'       => 'int',
     'text'         => 'string',
     'varchar'      => 'string',
-    'phone_number' => 'PhoneNumberType',
+    'phone_number' => 'PhoneNumber',
 ];
 
 $path = Yaml::parseFile(ROOT . '/config/services.yaml')['services']['app.core.schemadef_driver']['arguments'][0];
diff --git a/src/Entity/LocalUser.php b/src/Entity/LocalUser.php
index b9ea25dd69..1340efa643 100644
--- a/src/Entity/LocalUser.php
+++ b/src/Entity/LocalUser.php
@@ -25,6 +25,7 @@ use App\Util\Common;
 use DateTime;
 use DateTimeInterface;
 use Exception;
+use libphonenumber\PhoneNumber;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
@@ -52,7 +53,7 @@ class LocalUser implements UserInterface
     private ?bool $is_email_verified;
     private ?string $language;
     private ?string $timezone;
-    private ?PhoneNumberType $phone_number;
+    private ?PhoneNumber $phone_number;
     private ?int $sms_carrier;
     private ?string $sms_email;
     private ?string $uri;
@@ -132,12 +133,12 @@ class LocalUser implements UserInterface
         return $this->timezone;
     }
 
-    public function setPhoneNumber(?PhoneNumberType $phone_number): self
+    public function setPhoneNumber(?PhoneNumber $phone_number): self
     {
         $this->phone_number = $phone_number;
         return $this;
     }
-    public function getPhoneNumber(): ?PhoneNumberType
+    public function getPhoneNumber(): ?PhoneNumber
     {
         return $this->phone_number;
     }
@@ -329,8 +330,8 @@ class LocalUser implements UserInterface
         if (password_verify($new_password, $this->password)) {
             // Update old formats
             if (password_needs_rehash($this->password,
-                                         self::algoNameToConstant(Common::config('security', 'algorithm')),
-                                         Common::config('security', 'options'))
+                                      self::algoNameToConstant(Common::config('security', 'algorithm')),
+                                      Common::config('security', 'options'))
             ) {
                 $this->changePassword($new_password, true);
             }