Merge pull request #61 from giggsey/smaller-metadata

🐛 Handle missing country codes

src/PhoneNumber.php

@@ -10,7 +10,7 @@ class PhoneNumber implements \Serializable, \Stringable
      * The country calling code for this number, as defined by the International Telecommunication Union
      * (ITU). For example, this would be 1 for NANPA countries, and 33 for France.
      */
-    protected ?int $countryCode = null;
+    protected int $countryCode = 0;
     /**
      * National (significant) Number is defined in International Telecommunication Union (ITU)
      * Recommendation E.164. It is a language/country-neutral representation of a phone number at a
@@ -76,6 +76,7 @@ class PhoneNumber implements \Serializable, \Stringable
      * The number of leading zeros of this phone number.
      */
     protected int $numberOfLeadingZeros = 1;
+    private bool $hasCountryCode = false;
 
     /**
      * Clears this phone number.
@@ -104,7 +105,8 @@ public function clear(): PhoneNumber
      */
     public function clearCountryCode(): PhoneNumber
     {
-        $this->countryCode = null;
+        $this->countryCode = 0;
+        $this->hasCountryCode = false;
         return $this;
     }
 
@@ -229,15 +231,10 @@ public function mergeFrom(PhoneNumber $other): PhoneNumber
      */
     public function hasCountryCode(): bool
     {
-        return $this->countryCode !== null;
+        return $this->hasCountryCode;
     }
 
-    /**
-     * Returns the country code of this phone number.
-     *
-     * @return int|null The country code, or null if not set.
-     */
-    public function getCountryCode(): ?int
+    public function getCountryCode(): int
     {
         return $this->countryCode;
     }
@@ -251,6 +248,7 @@ public function getCountryCode(): ?int
      */
     public function setCountryCode(int $value): PhoneNumber
     {
+        $this->hasCountryCode = true;
         $this->countryCode = $value;
         return $this;
     }

tests/Issues/UKNumbersTest.php

@@ -2,6 +2,7 @@
 
 namespace libphonenumber\Tests\Issues;
 
+use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
@@ -159,4 +160,13 @@ public function testInvalidNumber(): void
         $valid = $this->phoneUtil->isValidNumber($phoneObject);
         $this->assertFalse($valid, 'Checking phone number is invalid');
     }
+
+    public function testFormattingNumberWithNoCountryCode(): void
+    {
+        $number = new PhoneNumber();
+        $number->setNationalNumber('999');
+
+        $formatted = $this->phoneUtil->format($number, PhoneNumberFormat::E164);
+        $this->assertEquals('+0999', $formatted);
+    }
 }