Move Units back into Supplemental

ICanBoogie · Aug 11, 2024 · 87e1d72 · 87e1d72
1 parent 10c7da9
commit 87e1d72
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -62,8 +62,8 @@ generate: \
 	src/General/Transforms/HasContextTransforms.php \
 	src/Numbers/CurrencyData.php \
 	src/Supplemental/Territory/TerritoryData.php \
-	src/Units/SequenceCompanion.php \
-	src/Units/UnitsCompanion.php
+	src/Supplemental/Units/SequenceCompanion.php \
+	src/Supplemental/Units/UnitsCompanion.php
 
 src/Core/LocaleData.php: generator/src/Command/GenerateLocaleData.php
 	$(GENERATE) $@
@@ -77,8 +77,8 @@ src/Numbers/CurrencyData.php: generator/src/Command/GenerateCurrencyData.php
 src/Supplemental/Territory/TerritoryData.php: generator/src/Command/GenerateTerritoryData.php
 	$(GENERATE) $@
 
-src/Units/SequenceCompanion.php: generator/src/Command/GenerateSequenceCompanion.php
+src/Supplemental/Units/SequenceCompanion.php: generator/src/Command/GenerateSequenceCompanion.php
 	$(GENERATE) $@
 
-src/Units/UnitsCompanion.php: generator/src/Command/GenerateUnitsCompanion.php
+src/Supplemental/Units/UnitsCompanion.php: generator/src/Command/GenerateUnitsCompanion.php
 	$(GENERATE) $@
diff --git a/generator/src/Command/GenerateSequenceCompanion.php b/generator/src/Command/GenerateSequenceCompanion.php
@@ -11,7 +11,7 @@
 #[AsCommand(self::GENERATED_FILE)]
 final class GenerateSequenceCompanion extends Command
 {
-    private const GENERATED_FILE = 'src/Units/SequenceCompanion.php';
+    private const GENERATED_FILE = 'src/Supplemental/Units/SequenceCompanion.php';
 
     public function __construct(
         private readonly Repository $repository
@@ -69,7 +69,7 @@ private function render(
          * {@see \\$class}
          */
 
-        namespace ICanBoogie\CLDR\Units;
+        namespace ICanBoogie\CLDR\Supplemental\Units;
 
         /**
          * @internal

diff --git a/generator/src/Command/GenerateUnitsCompanion.php b/generator/src/Command/GenerateUnitsCompanion.php
@@ -11,7 +11,7 @@
 #[AsCommand(self::GENERATED_FILE)]
 final class GenerateUnitsCompanion extends Command
 {
-    private const GENERATED_FILE = 'src/Units/UnitsCompanion.php';
+    private const GENERATED_FILE = 'src/Supplemental/Units/UnitsCompanion.php';
 
     public function __construct(
         private readonly Repository $repository
@@ -72,7 +72,7 @@ private function render(
          * {@see \\$class}
          */
 
-        namespace ICanBoogie\CLDR\Units;
+        namespace ICanBoogie\CLDR\Supplemental\Units;
 
         /**
          * @internal

diff --git a/src/Core/Locale.php b/src/Core/Locale.php
@@ -16,7 +16,7 @@
 use ICanBoogie\CLDR\Numbers\NumberFormatterLocalized;
 use ICanBoogie\CLDR\Numbers\Numbers;
 use ICanBoogie\CLDR\Repository;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use ICanBoogie\CLDR\Warmable;
 use WeakMap;
 

diff --git a/src/Units/NumberPerUnit.php → src/Supplemental/Units/NumberPerUnit.php b/src/Units/NumberPerUnit.php → src/Supplemental/Units/NumberPerUnit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 use ICanBoogie\Accessor\AccessorTrait;
 

diff --git a/src/Units/NumberWithUnit.php → src/Supplemental/Units/NumberWithUnit.php b/src/Units/NumberWithUnit.php → src/Supplemental/Units/NumberWithUnit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 use ICanBoogie\Accessor\AccessorTrait;
 

diff --git a/src/Units/Sequence.php → src/Supplemental/Units/Sequence.php b/src/Units/Sequence.php → src/Supplemental/Units/Sequence.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 use ICanBoogie\Accessor\AccessorTrait;
 

diff --git a/src/Units/SequenceCompanion.php → src/Supplemental/Units/SequenceCompanion.php b/src/Units/SequenceCompanion.php → src/Supplemental/Units/SequenceCompanion.php
@@ -6,7 +6,7 @@
  * {@see \ICanBoogie\CLDR\Generator\Command\GenerateSequenceCompanion}
  */
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 /**
  * @internal

diff --git a/src/Units/Unit.php → src/Supplemental/Units/Unit.php b/src/Units/Unit.php → src/Supplemental/Units/Unit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 use ICanBoogie\Accessor\AccessorTrait;
 

diff --git a/src/Units/UnitLength.php → src/Supplemental/Units/UnitLength.php b/src/Units/UnitLength.php → src/Supplemental/Units/UnitLength.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 enum UnitLength: string
 {

diff --git a/src/Units/Units.php → src/Supplemental/Units/Units.php b/src/Units/Units.php → src/Supplemental/Units/Units.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 use ICanBoogie\CLDR\Core\Locale;
 use ICanBoogie\CLDR\General\Lists\ListType;

diff --git a/src/Units/UnitsCompanion.php → src/Supplemental/Units/UnitsCompanion.php b/src/Units/UnitsCompanion.php → src/Supplemental/Units/UnitsCompanion.php
@@ -6,7 +6,7 @@
  * {@see \ICanBoogie\CLDR\Generator\Command\GenerateUnitsCompanion}
  */
 
-namespace ICanBoogie\CLDR\Units;
+namespace ICanBoogie\CLDR\Supplemental\Units;
 
 /**
  * @internal

diff --git a/tests/Core/LocaleTest.php b/tests/Core/LocaleTest.php
@@ -11,7 +11,7 @@
 use ICanBoogie\CLDR\Numbers\NumberFormatterLocalized;
 use ICanBoogie\CLDR\Numbers\Numbers;
 use ICanBoogie\CLDR\Repository;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\CLDR\StringHelpers;

diff --git a/tests/General/UnitsTest.php b/tests/General/UnitsTest.php
@@ -3,8 +3,8 @@
 namespace Test\ICanBoogie\CLDR\General;
 
 use ICanBoogie\CLDR\Spaces;
-use ICanBoogie\CLDR\Units\UnitLength;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\UnitLength;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\CLDR\StringHelpers;

diff --git a/tests/Units/NumberPerUnitTest.php → .../Supplemental/Units/NumberPerUnitTest.php b/tests/Units/NumberPerUnitTest.php → .../Supplemental/Units/NumberPerUnitTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Test\ICanBoogie\CLDR\Units;
+namespace Test\ICanBoogie\CLDR\Supplemental\Units;
 
-use ICanBoogie\CLDR\Units\NumberPerUnit;
-use ICanBoogie\CLDR\Units\UnitLength;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\NumberPerUnit;
+use ICanBoogie\CLDR\Supplemental\Units\UnitLength;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\CLDR\StringHelpers;
 

diff --git a/tests/Units/NumberWithUnitTest.php → ...Supplemental/Units/NumberWithUnitTest.php b/tests/Units/NumberWithUnitTest.php → ...Supplemental/Units/NumberWithUnitTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Test\ICanBoogie\CLDR\Units;
+namespace Test\ICanBoogie\CLDR\Supplemental\Units;
 
-use ICanBoogie\CLDR\Units\NumberWithUnit;
-use ICanBoogie\CLDR\Units\UnitLength;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\NumberWithUnit;
+use ICanBoogie\CLDR\Supplemental\Units\UnitLength;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\CLDR\StringHelpers;
 

diff --git a/tests/Units/SequenceTest.php → tests/Supplemental/Units/SequenceTest.php b/tests/Units/SequenceTest.php → tests/Supplemental/Units/SequenceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Test\ICanBoogie\CLDR\Units;
+namespace Test\ICanBoogie\CLDR\Supplemental\Units;
 
-use ICanBoogie\CLDR\Units\Sequence;
-use ICanBoogie\CLDR\Units\UnitLength;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\Sequence;
+use ICanBoogie\CLDR\Supplemental\Units\UnitLength;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\TestCase;
 
 final class SequenceTest extends TestCase

diff --git a/tests/Units/UnitTest.php → tests/Supplemental/Units/UnitTest.php b/tests/Units/UnitTest.php → tests/Supplemental/Units/UnitTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Test\ICanBoogie\CLDR\Units;
+namespace Test\ICanBoogie\CLDR\Supplemental\Units;
 
-use ICanBoogie\CLDR\Units\Unit;
-use ICanBoogie\CLDR\Units\UnitLength;
-use ICanBoogie\CLDR\Units\Units;
+use ICanBoogie\CLDR\Supplemental\Units\Unit;
+use ICanBoogie\CLDR\Supplemental\Units\UnitLength;
+use ICanBoogie\CLDR\Supplemental\Units\Units;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;