Bug Fix en_SG mobile number generation (#1658)

* Fix SG mobile number generation

* rename function to oneToEight

* Fix en_SG mobile test regex

* fix en_SG mobile regex test 2

Author: ziming

src/Faker/Provider/en_SG/PhoneNumber.php

@@ -11,18 +11,15 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
 
     protected static $zeroToEight = array(0, 1, 2, 3, 4, 5, 6, 7, 8);
 
-    protected static $oneToNine = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
+    protected static $oneToEight = array(1, 2, 3, 4, 5, 6, 7, 8);
 
     protected static $mobileNumberFormats = array(
         '{{internationalCodePrefix}}9{{zeroToEight}}## ####',
         '{{internationalCodePrefix}} 9{{zeroToEight}}## ####',
         '9{{zeroToEight}}## ####',
-        '{{internationalCodePrefix}}8{{oneToNine}}## ####',
-        '{{internationalCodePrefix}} 8{{oneToNine}}## ####',
-        '8{{oneToNine}}## ####',
-        '{{internationalCodePrefix}}7{{oneToNine}}## ####',
-        '{{internationalCodePrefix}} 7{{oneToNine}}## ####',
-        '7{{oneToNine}}## ####',
+        '{{internationalCodePrefix}}8{{oneToEight}}## ####',
+        '{{internationalCodePrefix}} 8{{oneToEight}}## ####',
+        '8{{oneToEight}}## ####',
     );
 
     protected static $fixedLineNumberFormats = array(
@@ -103,8 +100,8 @@ public function zeroToEight()
         return static::randomElement(static::$zeroToEight);
     }
 
-    public function oneToNine()
+    public function oneToEight()
     {
-        return static::randomElement(static::$oneToNine);
+        return static::randomElement(static::$oneToEight);
     }
 }

test/Faker/Provider/en_SG/PhoneNumberTest.php

@@ -18,8 +18,8 @@ public function setUp()
     }
 
     // http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan
-    // y means 0 to 8 only
     // x means 0 to 9
+    // y means 0 to 8 only
     public function testMobilePhoneNumberStartWith9Returns9yxxxxxx()
     {
         $startsWith9 = false;
@@ -28,19 +28,19 @@ public function testMobilePhoneNumberStartWith9Returns9yxxxxxx()
             $startsWith9 = preg_match('/^(\+65|65)?\s*9/', $mobileNumber);
         }
 
-        $this->assertRegExp('/^(\+65|65)?\s*9\s*[0-8]{3}\s*\d{4}$/', $mobileNumber);
+        $this->assertRegExp('/^(\+65|65)?\s*9\s*[0-8]\d{2}\s*\d{4}$/', $mobileNumber);
     }
 
     // http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan
-    // z means 1 to 9 only
     // x means 0 to 9
-    public function testMobilePhoneNumberStartWith7Or8Returns7Or8zxxxxxx()
+    // z means 1 to 8 only
+    public function testMobilePhoneNumberStartWith8Returns8zxxxxxx()
     {
-        $startsWith7Or8 = false;
-        while (!$startsWith7Or8) {
+        $startsWith8 = false;
+        while (!$startsWith8) {
             $mobileNumber = $this->faker->mobileNumber();
-            $startsWith7Or8 = preg_match('/^(\+65|65)?\s*[7-8]/', $mobileNumber);
+            $startsWith8 = preg_match('/^(\+65|65)?\s*8/', $mobileNumber);
         }
-        $this->assertRegExp('/^(\+65|65)?\s*[7-8]\s*[1-9]{3}\s*\d{4}$/', $mobileNumber);
+        $this->assertRegExp('/^(\+65|65)?\s*8\s*[1-8]\d{2}\s*\d{4}$/', $mobileNumber);
     }
 }