add US & CZ address formats and use localized Faker

composer.json

@@ -33,9 +33,13 @@
         "illuminate/support": "^6.0 || ^7.0"
     },
     "require-dev": {
+        "fzaninotto/faker": "^1.6.0",
         "orchestra/testbench": "^4.0 || ^5.0",
         "phpunit/phpunit": "^8.0 || ^9.0"
     },
+    "suggest": {
+        "fzaninotto/faker": "^1.6.0"
+    },
     "config": {
         "sort-packages": true
     },

src/AddressFormats/BaseFormat.php

@@ -31,10 +31,17 @@ public function rules(?string $prefix = null): array
 
     public function fake(string $country, array $data = []): array
     {
+        $faker = Factory::create([
+            'CH' => 'de_CH',
+            'CZ' => 'cs_CZ',
+            'DE' => 'de_DE',
+            'US' => 'en_US',
+        ][$country] ?? null);
+
         return Arr::only(
             array_merge(
                 ['country_code' => $country],
-                $this->factory(Factory::create()),
+                $this->factory($faker),
                 $data
             ),
             $this->fields()

src/AddressFormats/CzechRepublic.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Elbgoods\LaravelAddressable\AddressFormats;
+
+use Faker\Generator;
+
+class CzechRepublic extends BaseFormat
+{
+    protected function formatConfig(): array
+    {
+        return [
+            'street' => [
+                'required',
+                'string',
+            ],
+            'house_number' => [
+                'required',
+                'string',
+            ],
+            'postal_code' => [
+                'required',
+                'string',
+                'regex:/^([0-9]{5}|[0-9]{3} [0-9]{2})$/',
+            ],
+            'city' => [
+                'required',
+                'string',
+            ],
+            'post_office' => [
+                'required',
+                'string',
+            ],
+        ];
+    }
+
+    protected function factory(Generator $faker): array
+    {
+        return [
+            'country_code' => 'CZ',
+            'street' => $faker->streetName,
+            'house_number' => $faker->buildingNumber,
+            'postal_code' => $faker->postcode,
+            'city' => $faker->city,
+            'post_office' => 'P.O. Box '.$faker->randomNumber(2),
+        ];
+    }
+}

src/AddressFormats/Germany.php

@@ -35,7 +35,7 @@ protected function factory(Generator $faker): array
             'country_code' => 'DE',
             'street' => $faker->streetName,
             'house_number' => $faker->buildingNumber,
-            'postal_code' => strval($faker->numberBetween(10000, 99999)),
+            'postal_code' => $faker->postcode,
             'city' => $faker->city,
         ];
     }

src/AddressFormats/Switzerland.php

@@ -6,7 +6,6 @@
 use Elbgoods\SwissCantonRule\Rules\SwissCantonZipCodeRule;
 use Faker\Generator;
 use Illuminate\Support\Arr;
-use Wnx\SwissCantons\Cantons;
 use Wnx\SwissCantons\ZipcodeSearch;
 
 class Switzerland extends BaseFormat
@@ -47,7 +46,7 @@ protected function factory(Generator $faker): array
             'house_number' => $faker->buildingNumber,
             'postal_code' => strval(Arr::random(array_column((new ZipcodeSearch)->getDataSet(), 'zipcode'))),
             'city' => $faker->city,
-            'canton' => Arr::random(array_keys((new Cantons)->getAllAsArray())),
+            'canton' => $faker->cantonShort,
         ];
     }
 }

src/AddressFormats/UnitedStatesOfAmerica.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Elbgoods\LaravelAddressable\AddressFormats;
+
+use Faker\Generator;
+
+class UnitedStatesOfAmerica extends BaseFormat
+{
+    protected function formatConfig(): array
+    {
+        return [
+            'street' => [
+                'required',
+                'string',
+            ],
+            'house_number' => [
+                'required',
+                'string',
+            ],
+            'postal_code' => [
+                'required',
+                'string',
+                'regex:/^[0-9]{5}(|-[0-9]{4})$/',
+            ],
+            'city' => [
+                'required',
+                'string',
+            ],
+            'state' => [
+                'required',
+                'string',
+                'regex:/^[A-Z]{2}$/',
+            ],
+        ];
+    }
+
+    protected function factory(Generator $faker): array
+    {
+        return [
+            'country_code' => 'US',
+            'street' => $faker->streetName,
+            'house_number' => $faker->buildingNumber,
+            'postal_code' => $faker->postcode,
+            'city' => $faker->city,
+            'state' => $faker->stateAbbr,
+        ];
+    }
+}

src/Managers/AddressFormats.php

@@ -2,9 +2,11 @@
 
 namespace Elbgoods\LaravelAddressable\Managers;
 
+use Elbgoods\LaravelAddressable\AddressFormats\CzechRepublic;
 use Elbgoods\LaravelAddressable\AddressFormats\Germany;
 use Elbgoods\LaravelAddressable\AddressFormats\International;
 use Elbgoods\LaravelAddressable\AddressFormats\Switzerland;
+use Elbgoods\LaravelAddressable\AddressFormats\UnitedStatesOfAmerica;
 use Elbgoods\LaravelAddressable\Contracts\AddressFormat;
 use Illuminate\Support\Manager;
 use Illuminate\Support\Str;
@@ -15,9 +17,11 @@ class AddressFormats extends Manager
     protected const DEFAULT_DRIVER = 'international';
 
     protected const FORMATS = [
-        'international' => International::class,
-        'de' => Germany::class,
-        'ch' => Switzerland::class,
+        self::DEFAULT_DRIVER => International::class,
+        'CH' => Switzerland::class,
+        'CZ' => CzechRepublic::class,
+        'DE' => Germany::class,
+        'US' => UnitedStatesOfAmerica::class,
     ];
 
     public function country(?string $country = null): AddressFormat
@@ -47,8 +51,6 @@ public function getDefaultDriver(): string
 
     public function driver($driver = null): AddressFormat
     {
-        $driver = is_string($driver) ? strtolower($driver) : $driver;
-
         try {
             return parent::driver($driver);
         } catch (InvalidArgumentException $exception) {

tests/AddressFormats/CzechRepublicTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Elbgoods\LaravelAddressable\Tests\AddressFormats;
+
+use Elbgoods\LaravelAddressable\Facades\AddressFormats;
+use Illuminate\Support\Facades\Validator;
+
+final class CzechRepublicTest extends BaseFormatTest
+{
+    /**
+     * @test
+     * @dataProvider repeatTest
+     */
+    public function faked_address_passes_validation_rules(): void
+    {
+        $data = AddressFormats::fake('CZ');
+
+        $validator = Validator::make($data, AddressFormats::rules('CZ'));
+
+        $this->assertFalse($validator->fails(), $validator->errors()->first());
+    }
+}

tests/AddressFormats/UnitedStatesOfAmericaTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Elbgoods\LaravelAddressable\Tests\AddressFormats;
+
+use Elbgoods\LaravelAddressable\Facades\AddressFormats;
+use Illuminate\Support\Facades\Validator;
+
+final class UnitedStatesOfAmericaTest extends BaseFormatTest
+{
+    /**
+     * @test
+     * @dataProvider repeatTest
+     */
+    public function faked_address_passes_validation_rules(): void
+    {
+        $data = AddressFormats::fake('US');
+
+        $validator = Validator::make($data, AddressFormats::rules('US'));
+
+        $this->assertFalse($validator->fails(), $validator->errors()->first());
+    }
+}

tests/Managers/AddressFormatsTest.php

@@ -24,7 +24,7 @@ public function specific_format_by_identifier(): void
     {
         $this->assertInstanceOf(
             Germany::class,
-            AddressFormats::country('de')
+            AddressFormats::country('DE')
         );
     }