refactor: moves DomainCollection in the generic Type namespace

matiux · Nov 23, 2022 · 37c51ad · 37c51ad
1 parent 03224c4
commit 37c51ad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/...ack/Aggregate/Domain/DomainCollection.php → ...Matiux/DDDStarterPack/Type/Collection.php b/...ack/Aggregate/Domain/DomainCollection.php → ...Matiux/DDDStarterPack/Type/Collection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DDDStarterPack\Aggregate\Domain;
+namespace DDDStarterPack\Type;
 
 use Iterator;
 
@@ -13,7 +13,7 @@
  *
  * @implements Iterator<array-key, T>
  */
-class DomainCollection implements \Iterator, \Countable
+class Collection implements \Iterator, \Countable
 {
     private int $position = 0;
 
@@ -82,7 +82,7 @@ public function toArray(): array
     }
 
     /**
-     * @template B of DomainCollection<T>
+     * @template B of Collection<T>
      *
      * @param B $collection
      *

diff --git a/...tiux/DDDStarterPack/Type/DoctrineDate.php → ...tarterPack/Type/Doctrine/DoctrineDate.php b/...tiux/DDDStarterPack/Type/DoctrineDate.php → ...tarterPack/Type/Doctrine/DoctrineDate.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DDDStarterPack\Type;
+namespace DDDStarterPack\Type\Doctrine;
 
+use DDDStarterPack\Type\Date;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateType;

diff --git a/...DStarterPack/Type/DoctrineDateTimeRFC.php → ...ack/Type/Doctrine/DoctrineDateTimeRFC.php b/...DStarterPack/Type/DoctrineDateTimeRFC.php → ...ack/Type/Doctrine/DoctrineDateTimeRFC.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace DDDStarterPack\Type;
+namespace DDDStarterPack\Type\Doctrine;
 
+use DDDStarterPack\Type\DateTimeRFC;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateTimeImmutableType;

diff --git a/...Aggregate/Domain/DomainCollectionTest.php → ...it/DDDStarterPack/Type/CollectionTest.php b/...Aggregate/Domain/DomainCollectionTest.php → ...it/DDDStarterPack/Type/CollectionTest.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit\DDDStarterPack\Aggregate\Domain;
+namespace Tests\Unit\DDDStarterPack\Type;
 
-use DDDStarterPack\Aggregate\Domain\DomainCollection;
+use DDDStarterPack\Type\Collection;
 use PHPUnit\Framework\TestCase;
 
-class DomainCollectionTest extends TestCase
+class CollectionTest extends TestCase
 {
-    /** @var DomainCollection<MyData> */
-    private DomainCollection $collection;
+    /** @var Collection<MyData> */
+    private Collection $collection;
 
     protected function setUp(): void
     {
@@ -22,7 +22,7 @@ protected function setUp(): void
 
         $items = [$a, $b];
 
-        $this->collection = new DomainCollection($items);
+        $this->collection = new Collection($items);
     }
 
     /**
@@ -62,7 +62,7 @@ public function it_should_be_mergeable(): void
         $c = new MyData();
         $c->data = true;
 
-        $collection2 = new DomainCollection([$c]);
+        $collection2 = new Collection([$c]);
         $mergedCollection = $this->collection->merge($collection2);
 
         self::assertCount(3, $mergedCollection);