Merge country code and country code short

PrinsFrank · Mar 22, 2023 · d12f90f · d12f90f
1 parent d8afc71
commit d12f90f
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 1,452 deletions.
diff --git a/dev/DataSource/CountryShort/CountryAlpha2Source.php b/dev/DataSource/CountryShort/CountryAlpha2Source.php
@@ -3,7 +3,7 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
 
-use PrinsFrank\Standards\CountryShort\CountryAlpha2;
+use PrinsFrank\Standards\Country\CountryAlpha2;
 use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_2_Source;
 
 class CountryAlpha2Source extends ISO3166_1_Alpha_2_Source

diff --git a/dev/DataSource/CountryShort/CountryAlpha3Source.php b/dev/DataSource/CountryShort/CountryAlpha3Source.php
@@ -3,7 +3,7 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
 
-use PrinsFrank\Standards\CountryShort\CountryAlpha3;
+use PrinsFrank\Standards\Country\CountryAlpha3;
 use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_3_Source;
 
 class CountryAlpha3Source extends ISO3166_1_Alpha_3_Source

diff --git a/dev/DataSource/CountryShort/CountryNameSource.php b/dev/DataSource/CountryShort/CountryNameSource.php
@@ -3,7 +3,7 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
 
-use PrinsFrank\Standards\CountryShort\CountryName;
+use PrinsFrank\Standards\Country\CountryName;
 use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Name_Source;
 
 class CountryNameSource extends ISO3166_1_Name_Source

diff --git a/dev/DataSource/CountryShort/CountryNumericSource.php b/dev/DataSource/CountryShort/CountryNumericSource.php
@@ -3,7 +3,7 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
 
-use PrinsFrank\Standards\CountryShort\CountryNumeric;
+use PrinsFrank\Standards\Country\CountryNumeric;
 use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Numeric_Source;
 
 class CountryNumericSource extends ISO3166_1_Numeric_Source

diff --git a/src/CountryShort/CountryAlpha2.php → src/Country/CountryAlpha2.php b/src/CountryShort/CountryAlpha2.php → src/Country/CountryAlpha2.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\CountryShort;
+namespace PrinsFrank\Standards\Country;
 
 use PrinsFrank\Standards\BackedEnum;
 

diff --git a/src/CountryShort/CountryAlpha3.php → src/Country/CountryAlpha3.php b/src/CountryShort/CountryAlpha3.php → src/Country/CountryAlpha3.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\CountryShort;
+namespace PrinsFrank\Standards\Country;
 
 use PrinsFrank\Standards\BackedEnum;
 

diff --git a/src/CountryShort/CountryName.php → src/Country/CountryName.php b/src/CountryShort/CountryName.php → src/Country/CountryName.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\CountryShort;
+namespace PrinsFrank\Standards\Country;
 
 use PrinsFrank\Standards\BackedEnum;
 

diff --git a/src/CountryShort/CountryNumeric.php → src/Country/CountryNumeric.php b/src/CountryShort/CountryNumeric.php → src/Country/CountryNumeric.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\CountryShort;
+namespace PrinsFrank\Standards\Country;
 
 use PrinsFrank\Standards\BackedEnum;
 

diff --git a/src/Country/ISO3166_1_Alpha_2.php b/src/Country/ISO3166_1_Alpha_2.php
diff --git a/src/Country/ISO3166_1_Alpha_3.php b/src/Country/ISO3166_1_Alpha_3.php
diff --git a/src/Country/ISO3166_1_Name.php b/src/Country/ISO3166_1_Name.php
diff --git a/src/Country/ISO3166_1_Numeric.php b/src/Country/ISO3166_1_Numeric.php
diff --git a/...s/Unit/CountryShort/CountryAlpha2Test.php → tests/Unit/Country/CountryAlpha2Test.php b/...s/Unit/CountryShort/CountryAlpha2Test.php → tests/Unit/Country/CountryAlpha2Test.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\Tests\Unit\CountryShort;
+namespace PrinsFrank\Standards\Tests\Unit\Country;
 
 use PHPUnit\Framework\TestCase;
-use PrinsFrank\Standards\CountryShort\CountryAlpha2;
+use PrinsFrank\Standards\Country\CountryAlpha2;
 use TypeError;
 
 /**
- * @coversDefaultClass \PrinsFrank\Standards\CountryShort\CountryAlpha2
+ * @coversDefaultClass \PrinsFrank\Standards\Country\CountryAlpha2
  */
 class CountryAlpha2Test extends TestCase
 {

diff --git a/...s/Unit/CountryShort/CountryAlpha3Test.php → tests/Unit/Country/CountryAlpha3Test.php b/...s/Unit/CountryShort/CountryAlpha3Test.php → tests/Unit/Country/CountryAlpha3Test.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\Tests\Unit\CountryShort;
+namespace PrinsFrank\Standards\Tests\Unit\Country;
 
 use PHPUnit\Framework\TestCase;
-use PrinsFrank\Standards\CountryShort\CountryAlpha3;
+use PrinsFrank\Standards\Country\CountryAlpha3;
 use TypeError;
 
 /**
- * @coversDefaultClass \PrinsFrank\Standards\CountryShort\CountryAlpha3
+ * @coversDefaultClass \PrinsFrank\Standards\Country\CountryAlpha3
  */
 class CountryAlpha3Test extends TestCase
 {

diff --git a/tests/Unit/CountryShort/CountryNameTest.php → tests/Unit/Country/CountryNameTest.php b/tests/Unit/CountryShort/CountryNameTest.php → tests/Unit/Country/CountryNameTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\Tests\Unit\CountryShort;
+namespace PrinsFrank\Standards\Tests\Unit\Country;
 
 use PHPUnit\Framework\TestCase;
-use PrinsFrank\Standards\CountryShort\CountryName;
+use PrinsFrank\Standards\Country\CountryName;
 use TypeError;
 
 /**
- * @coversDefaultClass \PrinsFrank\Standards\CountryShort\CountryName
+ * @coversDefaultClass \PrinsFrank\Standards\Country\CountryName
  */
 class CountryNameTest extends TestCase
 {

diff --git a/.../Unit/CountryShort/CountryNumericTest.php → tests/Unit/Country/CountryNumericTest.php b/.../Unit/CountryShort/CountryNumericTest.php → tests/Unit/Country/CountryNumericTest.php
@@ -1,15 +1,15 @@
 <?php
 declare(strict_types=1);
 
-namespace PrinsFrank\Standards\Tests\Unit\CountryShort;
+namespace PrinsFrank\Standards\Tests\Unit\Country;
 
 use PHPUnit\Framework\TestCase;
-use PrinsFrank\Standards\CountryShort\CountryNumeric;
+use PrinsFrank\Standards\Country\CountryNumeric;
 use TypeError;
 use ValueError;
 
 /**
- * @coversDefaultClass \PrinsFrank\Standards\CountryShort\CountryNumeric
+ * @coversDefaultClass \PrinsFrank\Standards\Country\CountryNumeric
  */
 class CountryNumericTest extends TestCase
 {

diff --git a/tests/Unit/Country/ISO3166_1_Alpha_2Test.php b/tests/Unit/Country/ISO3166_1_Alpha_2Test.php
diff --git a/tests/Unit/Country/ISO3166_1_Alpha_3Test.php b/tests/Unit/Country/ISO3166_1_Alpha_3Test.php
diff --git a/tests/Unit/Country/ISO3166_1_NameTest.php b/tests/Unit/Country/ISO3166_1_NameTest.php