update : refactor app structure

irivengroup · irivengroup · commit e42fe4370563 · 2026-04-13T01:43:34.000+02:00
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -2,4 +2,4 @@
 
 declare(strict_types=1);
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/CountriesCollectionAggregatorTest.php b/tests/CountriesCollectionAggregatorTest.php
@@ -4,15 +4,13 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionAggregator;
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountryCodeFormat;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionAggregatorTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testAggregationMethods(): void
     {
@@ -46,4 +44,4 @@ public function testAggregationMethods(): void
             'US' => 'United States',
         ], $aggregator->list($countries, CountryCodeFormat::ALPHA2));
     }
-}
+}
diff --git a/tests/CountriesCollectionExporterTest.php b/tests/CountriesCollectionExporterTest.php
@@ -4,14 +4,12 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionExporter;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionExporterTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testToApiArrayAndToStorageArray(): void
     {
@@ -28,4 +26,4 @@ public function testToApiArrayAndToStorageArray(): void
         self::assertSame('FR', $storage[0][0]);
         self::assertSame('France', $storage[0][3]);
     }
-}
+}
diff --git a/tests/CountriesCollectionFacadeTest.php b/tests/CountriesCollectionFacadeTest.php
@@ -4,14 +4,12 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionFacadeTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testFacadeDelegatesCorrectly(): void
     {
@@ -45,4 +43,4 @@ public function testFacadeDelegatesCorrectly(): void
         self::assertJson($collection->toJson());
         self::assertNotSame('', $collection->toCsv());
     }
-}
+}
diff --git a/tests/CountriesCollectionFilterTest.php b/tests/CountriesCollectionFilterTest.php
@@ -4,14 +4,12 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionFilter;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionFilterTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testFilteringMethods(): void
     {
@@ -30,4 +28,4 @@ public function testFilteringMethods(): void
         self::assertTrue($filter->contains($countries, '250'));
         self::assertFalse($filter->contains($countries, 'ZZ'));
     }
-}
+}
diff --git a/tests/CountriesCollectionReadModelTest.php b/tests/CountriesCollectionReadModelTest.php
@@ -4,7 +4,6 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionCache;
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionReadModel;
@@ -13,7 +12,6 @@
 
 final class CountriesCollectionReadModelTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testReadModelMethods(): void
     {
@@ -48,4 +46,4 @@ public function testReadModelMethods(): void
         self::assertTrue($reader->containsCountry($countries, static fn($country): bool => $country->currency()->code() === 'JPY'));
         self::assertFalse($reader->containsCountry($countries, static fn($country): bool => $country->alpha2() === 'ZZ'));
     }
-}
+}
diff --git a/tests/CountriesCollectionSequenceTest.php b/tests/CountriesCollectionSequenceTest.php
@@ -4,15 +4,13 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionSequence;
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountryCodeFormat;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionSequenceTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testSequenceMethods(): void
     {
@@ -37,4 +35,4 @@ public function testSequenceMethods(): void
         $paginated = $sequence->paginate($countries, 1, 2, CountryCodeFormat::ALPHA2);
         self::assertSame(['DE', 'US'], $paginated->pluckCodes());
     }
-}
+}
diff --git a/tests/CountriesCollectionSorterTest.php b/tests/CountriesCollectionSorterTest.php
@@ -4,15 +4,13 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionSorter;
 use Iriven\WorldDatasets\Domain\CountriesCollection\CountryCodeFormat;
 use PHPUnit\Framework\TestCase;
 
 final class CountriesCollectionSorterTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testSortByNameCodeAndNumeric(): void
     {
@@ -34,4 +32,4 @@ public function testSortByNameCodeAndNumeric(): void
         $numeric = $sorter->sortByNumeric($countries);
         self::assertSame(['250', '276', '392', '840'], array_map('strval', array_map(static fn($c) => $c->numeric(), $numeric)));
     }
-}
+}
diff --git a/tests/CsvCountryRepositoryTest.php b/tests/CsvCountryRepositoryTest.php
@@ -48,4 +48,4 @@ public function testConstructLoadsCountriesFromCsv(): void
             }
         }
     }
-}
+}
diff --git a/tests/DatasetRegressionTest.php b/tests/DatasetRegressionTest.php
@@ -34,4 +34,4 @@ public function testDatasetCountsAndIntegrity(): void
         self::assertFalse($service->countries()->isEmpty());
         self::assertTrue($service->countries()->contains('FR'));
     }
-}
+}
diff --git a/tests/DatasetValidatorTest.php b/tests/DatasetValidatorTest.php
@@ -4,7 +4,6 @@
 
 namespace Iriven\WorldDatasets\Tests;
 use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;
-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;
 
 use Iriven\WorldDatasets\Domain\CountryInfo;
 use Iriven\WorldDatasets\Domain\DatasetValidator;
@@ -13,7 +12,6 @@
 
 final class DatasetValidatorTest extends TestCase
 {
-    use CountryFactoryTrait;
 
     public function testValidDatasetProducesValidReport(): void
     {
@@ -89,4 +87,4 @@ public function testStrictModeThrowsOnInvalidDataset(): void
         $this->expectException(DatasetValidationException::class);
         $validator->validate([$this->makeCountry('F1', 'FRA', '250', 'Brokenland')], true);
     }
-}
+}
diff --git a/tests/JsonCountryRepositoryTest.php b/tests/JsonCountryRepositoryTest.php
@@ -50,4 +50,4 @@ public function testSearchMethods(): void
         self::assertNotEmpty($this->repository->findByPhoneCode('33'));
         self::assertNotEmpty($this->repository->findByTld('.fr'));
     }
-}
+}
diff --git a/tests/SqliteConnectionFactoryTest.php b/tests/SqliteConnectionFactoryTest.php
@@ -39,4 +39,4 @@ public function testCreateReturnsPdoForExistingFile(): void
             }
         }
     }
-}
+}
diff --git a/tests/SqliteCountryHydratorTest.php b/tests/SqliteCountryHydratorTest.php
@@ -43,4 +43,4 @@ public function testHydrateAndHydrateMany(): void
         self::assertCount(2, $many);
         self::assertSame('FRA', $many[1]->alpha3());
     }
-}
+}
diff --git a/tests/SqliteCountryQueryBuilderTest.php b/tests/SqliteCountryQueryBuilderTest.php
@@ -26,4 +26,4 @@ public function testBuildsExpectedQueries(): void
         self::assertStringContainsString('SELECT region_name, alpha2, country_name', $builder->countriesGroupedByRegions());
         self::assertStringContainsString('SELECT currency_code, alpha2, country_name', $builder->countriesGroupedByCurrencies());
     }
-}
+}
diff --git a/tests/SqliteCountryRepositoryIntegrationTest.php b/tests/SqliteCountryRepositoryIntegrationTest.php
@@ -51,4 +51,4 @@ public function testRepositoryQueriesWorkAgainstSqliteFixture(): void
             $this->cleanupFile($path);
         }
     }
-}
+}
diff --git a/tests/SqliteStatementExecutorTest.php b/tests/SqliteStatementExecutorTest.php
@@ -74,4 +74,4 @@ public function testQueryMapAndGrouped(): void
         self::assertContains('France', $grouped['Europe']);
         self::assertContains('United States', $grouped['Americas']);
     }
-}
+}
diff --git a/tests/Support/CountryFactoryTrait.php b/tests/Support/CountryFactoryTrait.php
@@ -19,7 +19,7 @@ protected function makeCountry(
         string $currencyName = 'Euro',
         string $phoneCode = '33',
         string $tld = '.fr'
-    ): CountryInfo {
+    ): CountryInfoInfo {
         return CountryInfo::fromDatabaseRow([
             'alpha2' => $alpha2,
             'alpha3' => $alpha3,
diff --git a/tests/Support/SqliteFixtureTrait.php b/tests/Support/SqliteFixtureTrait.php
@@ -88,4 +88,4 @@ protected function cleanupFile(string $path): void
             self::assertTrue(unlink($path));
         }
     }
-}
+}
diff --git a/tests/WorldDatasetsFactoryIntegrationTest.php b/tests/WorldDatasetsFactoryIntegrationTest.php
@@ -102,4 +102,4 @@ public function testMakeRepositorySupportsKnownExtensions(): void
             $this->cleanupFile($jsonReal);
         }
     }
-}
+}
diff --git a/tests/WorldDatasetsTest.php b/tests/WorldDatasetsTest.php
@@ -96,4 +96,4 @@ public function testFindCountryReturnsNullForUnknownCode(): void
     {
         self::assertNull($this->service->findCountry('ZZ'));
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-require_once __DIR__ . '/../vendor/autoload.php';`
	`5`	`+require_once __DIR__ . '/../vendor/autoload.php';`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,13 @@`
`4`	`4`
`5`	`5`	`namespace Iriven\WorldDatasets\Tests;`
`6`	`6`	`use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;`
`7`		`-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;`
`8`	`7`
`9`	`8`	`use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionAggregator;`
`10`	`9`	`use Iriven\WorldDatasets\Domain\CountriesCollection\CountryCodeFormat;`
`11`	`10`	`use PHPUnit\Framework\TestCase;`
`12`	`11`
`13`	`12`	`final class CountriesCollectionAggregatorTest extends TestCase`
`14`	`13`	`{`
`15`		`- use CountryFactoryTrait;`
`16`	`14`
`17`	`15`	`public function testAggregationMethods(): void`
`18`	`16`	`{`
`@@ -46,4 +44,4 @@ public function testAggregationMethods(): void`
`46`	`44`	`'US' => 'United States',`
`47`	`45`	`], $aggregator->list($countries, CountryCodeFormat::ALPHA2));`
`48`	`46`	`}`
`49`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,12 @@`
`4`	`4`
`5`	`5`	`namespace Iriven\WorldDatasets\Tests;`
`6`	`6`	`use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;`
`7`		`-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;`
`8`	`7`
`9`	`8`	`use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionExporter;`
`10`	`9`	`use PHPUnit\Framework\TestCase;`
`11`	`10`
`12`	`11`	`final class CountriesCollectionExporterTest extends TestCase`
`13`	`12`	`{`
`14`		`- use CountryFactoryTrait;`
`15`	`13`
`16`	`14`	`public function testToApiArrayAndToStorageArray(): void`
`17`	`15`	`{`
`@@ -28,4 +26,4 @@ public function testToApiArrayAndToStorageArray(): void`
`28`	`26`	`self::assertSame('FR', $storage[0][0]);`
`29`	`27`	`self::assertSame('France', $storage[0][3]);`
`30`	`28`	`}`
`31`		`-}`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace Iriven\WorldDatasets\Tests;`
`6`	`6`	`use Iriven\WorldDatasets\Tests\Support\CountryFactoryTrait;`
`7`		`-use Iriven\WorldDatasets\Domain\CountryInfoFactoryTrait;`
`8`	`7`
`9`	`8`	`use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionCache;`
`10`	`9`	`use Iriven\WorldDatasets\Domain\CountriesCollection\CountriesCollectionReadModel;`
`@@ -13,7 +12,6 @@`
`13`	`12`
`14`	`13`	`final class CountriesCollectionReadModelTest extends TestCase`
`15`	`14`	`{`
`16`		`- use CountryFactoryTrait;`
`17`	`15`
`18`	`16`	`public function testReadModelMethods(): void`
`19`	`17`	`{`
`@@ -48,4 +46,4 @@ public function testReadModelMethods(): void`
`48`	`46`	`self::assertTrue($reader->containsCountry($countries, static fn($country): bool => $country->currency()->code() === 'JPY'));`
`49`	`47`	`self::assertFalse($reader->containsCountry($countries, static fn($country): bool => $country->alpha2() === 'ZZ'));`
`50`	`48`	`}`
`51`		`-}`
	`49`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@ public function testConstructLoadsCountriesFromCsv(): void`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ public function testDatasetCountsAndIntegrity(): void`
`34`	`34`	`self::assertFalse($service->countries()->isEmpty());`
`35`	`35`	`self::assertTrue($service->countries()->contains('FR'));`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`