Apply namespace resolver to all types.

lunarstorm · Oct 15, 2024 · 81b922f · 81b922f
1 parent 79ea5ad
commit 81b922f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/Support/DomainResolver.php b/src/Support/DomainResolver.php
@@ -96,16 +96,14 @@ public static function resolveRootNamespace(string $type): ?string
      */
     public static function getDomainObjectNamespace(string $domain, string $type, ?string $name = null): string
     {
-        if (static::isApplicationLayer($type)) {
-            $customResolver = app('ddd')->getNamespaceResolver();
+        $customResolver = app('ddd')->getNamespaceResolver();
 
-            $resolved = is_callable($customResolver)
-                ? $customResolver($domain, $type, app('ddd')->getCommandContext())
-                : null;
+        $resolved = is_callable($customResolver)
+            ? $customResolver($domain, $type, app('ddd')->getCommandContext())
+            : null;
 
-            if (! is_null($resolved)) {
-                return $resolved;
-            }
+        if (! is_null($resolved)) {
+            return $resolved;
         }
 
         $resolver = function (string $domain, string $type, ?string $name) {

diff --git a/tests/ApplicationLayer/NamespaceResolverTest.php b/tests/ApplicationLayer/NamespaceResolverTest.php
@@ -18,11 +18,7 @@
         'namespace' => 'App',
     ]);
 
-    DDD::resolveNamespaceUsing(function (
-        string $domain,
-        string $type,
-        ?DomainCommandContext $context
-    ): ?string {
+    DDD::resolveNamespaceUsing(function (string $domain, string $type, ?DomainCommandContext $context): ?string {
         if ($type == 'controller' && $context->option('api')) {
             return "App\\Api\\Controllers\\{$domain}";
         }