Merge branch 'release/v0.2.21'

decodelabs · Nov 9, 2023 · b90c14e · b90c14e
2 parents dd81b70 + c31fdae
commit b90c14e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v0.2.21 (2023-11-09)
+* Simplified ArchetypeResolver Initialization
+
 ## v0.2.20 (2023-11-08)
 * Added unique option to register()
 * Added getResolvers() and getNormalizers() to Handler

diff --git a/src/Handler.php b/src/Handler.php
@@ -409,7 +409,9 @@ protected function ensureResolver(
         string $interface
     ): void {
         if (!isset($this->resolvers[$interface])) {
-            if (!$class = $this->resolve(Resolver::class, $interface)) {
+            if ($interface === Resolver::class) {
+                $class = ArchetypeResolver::class;
+            } elseif (!$class = $this->resolve(Resolver::class, $interface)) {
                 throw Exceptional::NotFound('Interface ' . $interface . ' has no Archetype resolver');
             }
 
@@ -422,6 +424,3 @@ protected function ensureResolver(
 
 // Register the Veneer facade
 Veneer::register(Handler::class, Archetype::class);
-
-// Load Archetype Resolver
-Archetype::register(new ArchetypeResolver());