Fixing layer rules

Author: Florian Krämer

src/Architecture/ModularArchitectureRule.php

@@ -292,12 +292,8 @@ private function validateCrossModuleDependency(
         string $usedClassName,
         int $line
     ): ?RuleError {
-        // Extract the class name from the full namespace
-        $parts = explode('\\', $usedClassName);
-        $className = end($parts);
-
-        // Check if it's an allowed cross-module import
-        $isAllowed = $this->isAllowedCrossModuleImport($className);
+        // Check if it's an allowed cross-module import using the full class name
+        $isAllowed = $this->isAllowedCrossModuleImport($usedClassName);
 
         if (!$isAllowed) {
             return RuleErrorBuilder::message(sprintf(
@@ -316,11 +312,12 @@ private function validateCrossModuleDependency(
 
     /**
      * Check if a class is allowed for cross-module import
+     * Matches against the fully qualified class name
      */
-    private function isAllowedCrossModuleImport(string $className): bool
+    private function isAllowedCrossModuleImport(string $fullyQualifiedClassName): bool
     {
         foreach ($this->allowedCrossModulePatterns as $pattern) {
-            if (preg_match($pattern, $className)) {
+            if (preg_match($pattern, $fullyQualifiedClassName)) {
                 return true;
             }
         }

tests/TestCases/Architecture/ModularArchitectureCustomCrossModuleRuleTest.php

@@ -22,11 +22,11 @@ protected function getRule(): Rule
             'App\\Capability',
             null, // Use default layer dependencies
             [
-                '/Facade$/',           // Keep default: Facade
-                '/FacadeInterface$/',  // Keep default: FacadeInterface
-                '/Input$/',            // Keep default: Input
-                '/Result$/',           // Keep default: Result
-                '/Dto$/',              // Custom: Allow Dto classes
+                '/Facade$/',                    // Keep default: Facade
+                '/FacadeInterface$/',           // Keep default: FacadeInterface
+                '/Input$/',                     // Keep default: Input
+                '/Result$/',                    // Keep default: Result
+                '/Dto$/',                       // Custom: Allow Dto classes
             ]
         );
     }

tests/TestCases/Architecture/ModularArchitectureCustomLayersRuleTest.php

@@ -27,10 +27,10 @@ protected function getRule(): Rule
                 'Presentation' => ['Application', 'Domain'],
             ],
             [
-                '/Facade$/',
-                '/FacadeInterface$/',
-                '/Input$/',
-                '/Result$/',
+                '/Facade$/',                    // Class names ending with Facade
+                '/FacadeInterface$/',           // Class names ending with FacadeInterface
+                '/Input$/',                     // Class names ending with Input
+                '/Result$/',                    // Class names ending with Result
             ]
         );
     }

tests/TestCases/Architecture/ModularArchitectureRuleTest.php

@@ -19,10 +19,10 @@ protected function getRule(): Rule
             'App\\Capability',
             null,
             [
-                '/Facade$/',
-                '/FacadeInterface$/',
-                '/Input$/',
-                '/Result$/',
+                '/Facade$/',                    // Class names ending with Facade
+                '/FacadeInterface$/',           // Class names ending with FacadeInterface
+                '/Input$/',                     // Class names ending with Input
+                '/Result$/',                    // Class names ending with Result
             ]
         );
     }