Update asserts and maps

composer.json

@@ -9,7 +9,6 @@
     "minimum-stability": "dev",
     "require": {
         "php": "^7.4",
-        "beberlei/assert": "^3.0",
         "daikon/data-structure": "master@dev",
         "daikon/event-sourcing": "master@dev",
         "daikon/interop": "master@dev",

psalm.xml

@@ -39,6 +39,7 @@
         <MissingConstructor errorLevel="info" />
         <MissingClosureParamType errorLevel="info" />
         <MissingParamType errorLevel="info" />
+        <MixedClone errorLevel="suppress" />
 
         <RedundantCondition errorLevel="info" />
 

src/Connector/ConnectorMap.php

@@ -8,13 +8,10 @@
 
 namespace Daikon\Dbal\Connector;
 
-use Daikon\DataStructure\TypedMapInterface;
-use Daikon\DataStructure\TypedMapTrait;
+use Daikon\DataStructure\TypedMap;
 
-final class ConnectorMap implements TypedMapInterface
+final class ConnectorMap extends TypedMap
 {
-    use TypedMapTrait;
-
     public function __construct(iterable $connectors = [])
     {
         $this->init($connectors, [ConnectorInterface::class]);

src/Migration/MigrationAdapterMap.php

@@ -8,13 +8,10 @@
 
 namespace Daikon\Dbal\Migration;
 
-use Daikon\DataStructure\TypedMapInterface;
-use Daikon\DataStructure\TypedMapTrait;
+use Daikon\DataStructure\TypedMap;
 
-final class MigrationAdapterMap implements TypedMapInterface
+final class MigrationAdapterMap extends TypedMap
 {
-    use TypedMapTrait;
-
     public function __construct(iterable $migrationAdapters = [])
     {
         $this->init($migrationAdapters, [MigrationAdapterInterface::class]);

src/Migration/MigrationList.php

@@ -8,14 +8,11 @@
 
 namespace Daikon\Dbal\Migration;
 
-use Daikon\DataStructure\TypedListInterface;
-use Daikon\DataStructure\TypedListTrait;
+use Daikon\DataStructure\TypedList;
 use Daikon\Interop\ToNativeInterface;
 
-final class MigrationList implements TypedListInterface, ToNativeInterface
+final class MigrationList extends TypedList implements ToNativeInterface
 {
-    use TypedListTrait;
-
     public function __construct(iterable $migrations = [])
     {
         $this->init($migrations, [MigrationInterface::class]);

src/Migration/MigrationLoaderMap.php

@@ -8,13 +8,10 @@
 
 namespace Daikon\Dbal\Migration;
 
-use Daikon\DataStructure\TypedMapInterface;
-use Daikon\DataStructure\TypedMapTrait;
+use Daikon\DataStructure\TypedMap;
 
-final class MigrationLoaderMap implements TypedMapInterface
+final class MigrationLoaderMap extends TypedMap
 {
-    use TypedMapTrait;
-
     public function __construct(iterable $migrationLoaders = [])
     {
         $this->init($migrationLoaders, [MigrationLoaderInterface::class]);

src/Migration/MigrationTargetMap.php

@@ -8,13 +8,10 @@
 
 namespace Daikon\Dbal\Migration;
 
-use Daikon\DataStructure\TypedMapInterface;
-use Daikon\DataStructure\TypedMapTrait;
+use Daikon\DataStructure\TypedMap;
 
-final class MigrationTargetMap implements TypedMapInterface
+final class MigrationTargetMap extends TypedMap
 {
-    use TypedMapTrait;
-
     public function __construct(iterable $migrationTargets = [])
     {
         $this->init($migrationTargets, [MigrationTargetInterface::class]);

src/Migration/MigrationTrait.php

@@ -8,8 +8,8 @@
 
 namespace Daikon\Dbal\Migration;
 
-use Assert\Assertion;
 use Daikon\Dbal\Connector\ConnectorInterface;
+use Daikon\Interop\Assertion;
 use Daikon\Interop\RuntimeException;
 use DateTimeImmutable;
 use ReflectionClass;

src/Storage/StorageAdapterMap.php

@@ -8,15 +8,12 @@
 
 namespace Daikon\Dbal\Storage;
 
-use Daikon\DataStructure\TypedMapInterface;
-use Daikon\DataStructure\TypedMapTrait;
+use Daikon\DataStructure\TypedMap;
 use Daikon\ReadModel\Storage\StorageAdapterInterface as ReadModelStorageAdapterInterface;
 use Daikon\EventSourcing\EventStore\Storage\StorageAdapterInterface as EventStoreStorageAdapterInterface;
 
-final class StorageAdapterMap implements TypedMapInterface
+final class StorageAdapterMap extends TypedMap
 {
-    use TypedMapTrait;
-
     public function __construct(iterable $storageAdapters = [])
     {
         $this->init(

tests/Connector/ConnectorMapTest.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+/**
+ * This file is part of the daikon-cqrs/dbal project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Daikon\Tests\Dbal\Connector;
+
+use Daikon\Dbal\Connector\ConnectorInterface;
+use Daikon\Dbal\Connector\ConnectorMap;
+use PHPUnit\Framework\TestCase;
+
+final class ConnectorMapTest extends TestCase
+{
+    public function testConstructWithSelf(): void
+    {
+        $connectorMock = $this->createMock(ConnectorInterface::class);
+        $connectorMap = new ConnectorMap(['mock' => $connectorMock]);
+        $newMap = new ConnectorMap($connectorMap);
+        $this->assertCount(1, $newMap);
+        $this->assertNotSame($connectorMap, $newMap);
+        $this->assertEquals($connectorMap, $newMap);
+    }
+
+    public function testPush(): void
+    {
+        $emptyMap = new ConnectorMap;
+        $connectorMock = $this->createMock(ConnectorInterface::class);
+        $connectorMap = $emptyMap->with('mock', $connectorMock);
+        $this->assertCount(1, $connectorMap);
+        $this->assertEquals($connectorMock, $connectorMap->get('mock'));
+        $this->assertTrue($emptyMap->isEmpty());
+    }
+}

tests/Migration/MigrationAdapterMapTest.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+/**
+ * This file is part of the daikon-cqrs/dbal project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Daikon\Tests\Dbal\Migration;
+
+use Daikon\Dbal\Migration\MigrationAdapterInterface;
+use Daikon\Dbal\Migration\MigrationAdapterMap;
+use PHPUnit\Framework\TestCase;
+
+final class MigrationAdapterMapTest extends TestCase
+{
+    public function testConstructWithSelf(): void
+    {
+        $adapterMock = $this->createMock(MigrationAdapterInterface::class);
+        $adapterMap = new MigrationAdapterMap(['mock' => $adapterMock]);
+        $newMap = new MigrationAdapterMap($adapterMap);
+        $this->assertCount(1, $newMap);
+        $this->assertNotSame($adapterMap, $newMap);
+        $this->assertEquals($adapterMap, $newMap);
+    }
+
+    public function testPush(): void
+    {
+        $emptyMap = new MigrationAdapterMap;
+        $adapterMock = $this->createMock(MigrationAdapterInterface::class);
+        $adapterMap = $emptyMap->with('mock', $adapterMock);
+        $this->assertCount(1, $adapterMap);
+        $this->assertEquals($adapterMock, $adapterMap->get('mock'));
+        $this->assertTrue($emptyMap->isEmpty());
+    }
+}