Fix en_SG phone number generator (#100)

FakerPHP · Dec 2, 2020 · 56d115a · 56d115a
1 parent e942d5a
commit 56d115a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/src/Faker/Provider/en_SG/PhoneNumber.php b/src/Faker/Provider/en_SG/PhoneNumber.php
@@ -54,17 +54,17 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
 
     public function tollFreeInternationalNumber()
     {
-        return static::randomElement(static::$tollFreeInternationalNumber);
+        return static::numerify(static::randomElement(static::$tollFreeInternationalNumber));
     }
 
     public function tollFreeLineNumber()
     {
-        return static::randomElement(static::$tollFreeLineNumber);
+        return static::numerify(static::randomElement(static::$tollFreeLineNumber));
     }
 
     public function premiumPhoneNumber()
     {
-        return static::randomElement(static::$premiumPhoneNumber);
+        return static::numerify(static::randomElement(static::$premiumPhoneNumber));
     }
 
     public function mobileNumber()
@@ -85,14 +85,12 @@ public function voipNumber()
     {
         $format = static::randomElement(static::$voipNumber);
 
-        return $this->generator->parse($format);
+        return static::numerify($this->generator->parse($format));
     }
 
     public function internationalCodePrefix()
     {
-        $format = static::randomElement(static::$internationalCodePrefix);
-
-        return $this->generator->parse($format);
+        return static::randomElement(static::$internationalCodePrefix);
     }
 
     public function zeroToEight()

diff --git a/test/Faker/Provider/en_SG/PhoneNumberTest.php b/test/Faker/Provider/en_SG/PhoneNumberTest.php
@@ -47,4 +47,29 @@ public function testMobilePhoneNumberStartWith8Returns8zxxxxxx()
         }
         $this->assertMatchesRegularExpression('/^(\+65|65)?\s*8\s*[1-8]\d{2}\s*\d{4}$/', $mobileNumber);
     }
+
+    public function testTollFreeInternationalNumber()
+    {
+        self::assertMatchesRegularExpression('/^800\s*\d{3}\s*\d{4}$/', $this->faker->tollFreeInternationalNumber);
+    }
+
+    public function testTollFreeLineNumber()
+    {
+        self::assertMatchesRegularExpression('/^1800\s*\d{3}\s*\d{4}$/', $this->faker->tollFreeLineNumber);
+    }
+
+    public function testPremiumPhoneNumber()
+    {
+        self::assertMatchesRegularExpression('/^1900\s*\d{3}\s*\d{4}$/', $this->faker->premiumPhoneNumber);
+    }
+
+    public function testFixedLineNumber()
+    {
+        self::assertMatchesRegularExpression('/^(\+65|65)?\s*6\d{3}\s*\d{4}$/', $this->faker->fixedLineNumber);
+    }
+
+    public function testVoipNumber()
+    {
+        self::assertMatchesRegularExpression('/^(\+65|65)?\s*3\d{3}\s*\d{4}$/', $this->faker->voipNumber);
+    }
 }