Ensure that setTypes and setDescriptions perform merges

Author: dantleech

composer.json

@@ -17,7 +17,8 @@
         "friendsofphp/php-cs-fixer": "^2.17",
         "infection/infection": "^0.18.0",
         "phpstan/phpstan": "~0.12.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.0",
+        "symfony/var-dumper": "^6.1"
     },
     "extra": {
         "branch-alias": {
@@ -42,5 +43,11 @@
             "./vendor/bin/phpstan analyze",
             "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true,
+            "ergebnis/composer-normalize": true
+        }
     }
 }

lib/Resolver.php

@@ -77,23 +77,23 @@ public function setDefaults(array $defaults): void
      */
     public function setEnums(array $enums): void
     {
-        $this->enums = $enums;
+        $this->enums = array_merge($this->enums, $enums);
     }
 
     /**
-     * @param array<string,string> $typeMap
+     * @param array<string,string> $types
      */
-    public function setTypes(array $typeMap): void
+    public function setTypes(array $types): void
     {
-        $this->types = $typeMap;
+        $this->types = array_merge($this->types, $types);
     }
 
     /**
      * @param array<string,string> $descriptions
      */
     public function setDescriptions(array $descriptions): void
     {
-        $this->descriptions = $descriptions;
+        $this->descriptions = array_merge($this->descriptions, $descriptions);
     }
 
     /**

tests/Unit/ResolverTest.php

@@ -144,18 +144,62 @@ public function testResolvesDescriptions(): void
             'two' => 2,
             'three' => null,
             'four' => 4,
+            'five' => 4,
         ]);
         $resolver->setDescriptions([
             'two' => 'Two is the number',
             'four' => 'Four is also a number',
         ]);
+        $resolver->setDescriptions([
+            'five' => 'Five is the number',
+        ]);
         self::assertEquals([
             'two' => 'Two is the number',
             'four' => 'Four is also a number',
             'three' => null,
+            'five' => 'Five is the number',
         ], $resolver->resolveDescriptions());
     }
 
+    public function testResolvesEnums(): void
+    {
+        $resolver = new Resolver();
+        $resolver->setDefaults([
+            'two' => 2,
+        ]);
+        $resolver->setEnums([
+            'two' => [2],
+        ]);
+        $resolver->setEnums([
+            'two' => [2, 3],
+        ]);
+        self::assertEquals([
+            2,
+            3,
+        ], $resolver->definitions()->get('two')->enum());
+    }
+
+    public function testExceptionOnInvalidTypeAfterMerge(): void
+    {
+        $this->expectException(InvalidMap::class);
+        $this->expectExceptionMessage('got "NULL"');
+        $resolver = new Resolver();
+        $resolver->setDefaults([
+            'two' => 2,
+            'three' => null,
+        ]);
+        $resolver->setTypes([
+            'two' => 'integer',
+        ]);
+        $resolver->setTypes([
+            'three' => 'int',
+        ]);
+        self::assertEquals([
+            'two' => 2,
+            'three' => null,
+        ], $resolver->resolve([]));
+    }
+
     public function testReturnsDefinition(): void
     {
         $resolver = new Resolver();