feat: enhance VendorFileMapper with area emulation for compatibility

Author: dermatz

src/Service/VendorFileMapper.php

@@ -8,18 +8,21 @@
 use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\Filesystem\DirectoryList;
 use RuntimeException;
+use Magento\Framework\App\Area;
 
 class VendorFileMapper
 {
     /**
      * @param ComponentRegistrarInterface $componentRegistrar
      * @param DirectoryList $directoryList
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param \Magento\Framework\App\State $appState
      */
     public function __construct(
         private readonly ComponentRegistrarInterface $componentRegistrar,
         private readonly DirectoryList $directoryList,
-        private readonly \Magento\Framework\ObjectManagerInterface $objectManager
+        private readonly \Magento\Framework\ObjectManagerInterface $objectManager,
+        private readonly \Magento\Framework\App\State $appState
     ) {
     }
 
@@ -61,15 +64,20 @@ public function mapToThemePath(string $sourcePath, string $themePath, ?string $t
                 // Priority 1A: Check if this is a Hyva Compatibility Module
                 // If so, map to its registered "original_module"
                 $originalModule = $this->getOriginalModuleFromCompatRegistry($moduleName);
+
                 if ($originalModule) {
                     // Start with clean path (e.g. templates/Original_Module/foo.phtml or templates/foo.phtml)
                     $targetPath = ltrim($cleanPath, '/');
 
                     // If path contains the Original Module name as a subdirectory (Hyva convention), strip it
                     // Example: templates/Mollie_Payment/foo.phtml -> templates/foo.phtml
                     // This prevents Theme/Mollie_Payment/templates/Mollie_Payment/foo.phtml
+                    // Note: Check both strict and case-insensitive to be safe
                     if (str_contains($targetPath, '/' . $originalModule . '/')) {
                         $targetPath = str_replace('/' . $originalModule . '/', '/', $targetPath);
+                    } elseif (stripos($targetPath, '/' . $originalModule . '/') !== false) {
+                        // Case-insensitive replacement if strict failed
+                         $targetPath = str_ireplace('/' . $originalModule . '/', '/', $targetPath);
                     }
 
                     return rtrim($themePath, '/') . '/' . $originalModule . '/' . $targetPath;
@@ -203,24 +211,39 @@ private function isAreaCompatible(string $sourceArea, string $targetArea): bool
     private function getOriginalModuleFromCompatRegistry(string $compatModuleName): ?string
     {
         // Check if Hyva Compat Registry class exists (soft dependency)
-        // Note: class_exists takes a fully qualified class name string.
         if (!class_exists('\Hyva\CompatModuleFallback\Model\CompatModuleRegistry')) {
             return null;
         }
 
         try {
-            /** @var \Hyva\CompatModuleFallback\Model\CompatModuleRegistry $registry */
-            $registry = $this->objectManager->get('\Hyva\CompatModuleFallback\Model\CompatModuleRegistry');
+            // Emulate frontend area to load proper DI configuration for CompatModuleRegistry
+            // as CLI commands run in global scope where frontend/di.xml is ignored.
+            $registry = $this->appState->emulateAreaCode(
+                Area::AREA_FRONTEND,
+                function () {
+                    // Use create() to ensure we get a fresh instance with the emulated configuration.
+                    // get() might return a cached instance from global scope (empty).
+                    return $this->objectManager->create('\Hyva\CompatModuleFallback\Model\CompatModuleRegistry');
+                }
+            );
 
+            /** @var \Hyva\CompatModuleFallback\Model\CompatModuleRegistry $registry */
             // Iterate through original modules to find if current module is a registered compat module
             foreach ($registry->getOrigModules() as $originalModule) {
                 // Get compat modules for this original module
                 $compatModules = $registry->getCompatModulesFor($originalModule);
 
-                // If our module is in the list, return the original module
+                // Check exact match first
                 if (in_array($compatModuleName, $compatModules, true)) {
                     return $originalModule;
                 }
+
+                // Fallback: Case-insensitive check (some modules handle naming inconsistently)
+                foreach ($compatModules as $compatModule) {
+                    if (strnatcasecmp($compatModuleName, $compatModule) === 0) {
+                        return $originalModule;
+                    }
+                }
             }
         } catch (\Throwable $e) {
             // If anything fails (e.g. DI config issues), fallback to standard mapping