Merge pull request #903 from markuspoerschke/building_numbers_with_le…

…tters_de Add a building number with letter to German speaking locales.
fzaninotto · May 10, 2016 · 191fc2b · 191fc2b
2 parents 30f2b96 + 38a7b48
commit 191fc2b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/Faker/Provider/de_AT/Address.php b/src/Faker/Provider/de_AT/Address.php
@@ -4,7 +4,7 @@
 
 class Address extends \Faker\Provider\Address
 {
-    protected static $buildingNumber = array('###', '##', '#');
+    protected static $buildingNumber = array('###', '##', '#', '##[abc]', '#[abc]');
 
     protected static $streetSuffixLong = array(
         'Gasse', 'Platz', 'Ring', 'Straße', 'Weg',
@@ -108,4 +108,9 @@ public static function state()
     {
         return static::randomElement(static::$state);
     }
+
+    public static function buildingNumber()
+    {
+        return static::regexify(self::numerify(static::randomElement(static::$buildingNumber)));
+    }
 }
diff --git a/src/Faker/Provider/de_CH/Address.php b/src/Faker/Provider/de_CH/Address.php
@@ -4,7 +4,7 @@
 
 class Address extends \Faker\Provider\Address
 {
-    protected static $buildingNumber = array('###', '##', '#', '#a', '#b', '#c');
+    protected static $buildingNumber = array('###', '##', '#', '##[abc]', '#[abc]');
 
     protected static $streetSuffixLong = array(
         'Gasse', 'Platz', 'Ring', 'Strasse', 'Weg', 'Allee'
@@ -177,4 +177,9 @@ public static function cantonName()
         $canton = static::canton();
         return current($canton);
     }
+
+    public static function buildingNumber()
+    {
+        return static::regexify(self::numerify(static::randomElement(static::$buildingNumber)));
+    }
 }
diff --git a/src/Faker/Provider/de_DE/Address.php b/src/Faker/Provider/de_DE/Address.php
@@ -4,7 +4,7 @@
 
 class Address extends \Faker\Provider\Address
 {
-    protected static $buildingNumber = array('###', '##', '#', '#/#');
+    protected static $buildingNumber = array('###', '##', '#', '#/#', '##[abc]', '#[abc]');
 
     protected static $streetSuffixLong = array(
         'Gasse', 'Platz', 'Ring', 'Straße', 'Weg', 'Allee'
@@ -87,4 +87,9 @@ public static function state()
     {
         return static::randomElement(static::$state);
     }
+
+    public static function buildingNumber()
+    {
+        return static::regexify(self::numerify(static::randomElement(static::$buildingNumber)));
+    }
 }
diff --git a/test/Faker/Provider/en_SG/PhoneNumberTest.php b/test/Faker/Provider/en_SG/PhoneNumberTest.php
@@ -7,11 +7,13 @@
 
 class PhoneNumberTest extends \PHPUnit_Framework_TestCase
 {
+    private $faker;
+
     public function setUp()
     {
-        $faker = Factory::create('en_SG');
-        $faker->addProvider(new PhoneNumber($faker));
-        $this->faker = $faker;
+        $this->faker = Factory::create('en_SG');
+        $this->faker->seed(1);
+        $this->faker->addProvider(new PhoneNumber($this->faker));
     }
 
     // http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan