feat: enhance compatibility check with verbose output and add isHyvaAware determination logic

Author: dermatz

src/Console/Command/Hyva/CompatibilityCheckCommand.php

@@ -135,6 +135,10 @@ private function runInteractiveMode(InputInterface $input, OutputInterface $outp
     {
         $this->io->title('Hyvä Theme Compatibility Check');
 
+        if ($this->isVerbose($output)) {
+            $this->io->info('Running in interactive mode');
+        }
+
         // Set environment variables for Laravel Prompts
         $this->setPromptEnvironment();
 
@@ -230,6 +234,17 @@ private function runDirectMode(InputInterface $input, OutputInterface $output):
 
         $this->io->title('Hyvä Theme Compatibility Check');
 
+        if ($this->isVerbose($output)) {
+            $this->io->info(sprintf(
+                'Direct mode: showAll=%s, thirdPartyOnly=%s, includeCore=%s, excludeVendor=%s, detailed=%s',
+                $showAll ? 'true' : 'false',
+                $thirdPartyOnly ? 'true' : 'false',
+                $includeCore ? 'true' : 'false',
+                $excludeVendor ? 'true' : 'false',
+                $detailed ? 'true' : 'false',
+            ));
+        }
+
         return $this->runScan($showAll, $thirdPartyOnly, $includeCore, $excludeVendor, $detailed, false);
     }
 

src/Service/Hyva/ModuleScanner.php

@@ -174,13 +174,32 @@ public function getModuleInfo(string $modulePath): array
             return [
                 'name' => is_string($composerData['name'] ?? null) ? $composerData['name'] : 'Unknown',
                 'version' => is_string($composerData['version'] ?? null) ? $composerData['version'] : 'Unknown',
-                'isHyvaAware' => $this->isHyvaCompatibilityPackage($composerData),
+                'isHyvaAware' => $this->isHyvaAware($modulePath, $composerData),
             ];
         } catch (\Throwable $e) {
             return ['name' => 'Unknown', 'version' => 'Unknown', 'isHyvaAware' => false];
         }
     }
 
+    /**
+     * Determine whether a module is Hyvä-aware.
+     *
+     * A module is considered Hyvä-aware when it either declares a Hyvä dependency,
+     * is a Hyvä compatibility package, or ships a hyva-themes.json config.
+     *
+     * @param string $modulePath
+     * @param array<string, mixed> $composerData
+     * @return bool
+     */
+    private function isHyvaAware(string $modulePath, array $composerData): bool
+    {
+        if ($this->isHyvaCompatibilityPackage($composerData)) {
+            return true;
+        }
+
+        return $this->fileDriver->isExists($modulePath . '/hyva-themes.json');
+    }
+
     /**
      * Get basename without using basename().
      *

tests/Unit/Service/Hyva/ModuleScannerTest.php

@@ -226,7 +226,9 @@ private function givenDirectories(array $directories): void
      */
     private function givenComposerJson(array $composerData): void
     {
-        $this->fileDriver->method('isExists')->with('/module/composer.json')->willReturn(true);
+        $this->fileDriver->method('isExists')->willReturnCallback(
+            static fn(string $path): bool => $path === '/module/composer.json',
+        );
         $this->fileDriver->method('fileGetContents')->willReturn(json_encode($composerData));
     }
 
@@ -239,4 +241,27 @@ public function testNonHyvaRequirementsAreNotHyvaAware(): void
 
         $this->assertFalse($this->scanner->getModuleInfo('/module')['isHyvaAware']);
     }
+
+    public function testHyvaThemesJsonMakesModuleHyvaAware(): void
+    {
+        $this->fileDriver->method('isExists')->willReturnMap([
+            ['/module/composer.json', true],
+            ['/module/hyva-themes.json', true],
+        ]);
+        $this->fileDriver->method('fileGetContents')->with('/module/composer.json')->willReturn(
+            json_encode(['name' => 'vendor/module']),
+        );
+
+        $this->assertTrue($this->scanner->getModuleInfo('/module')['isHyvaAware']);
+    }
+
+    public function testComposerHyvaDependencyTakesPrecedenceOverMissingHyvaThemesJson(): void
+    {
+        $this->givenComposerJson([
+            'name' => 'vendor/module',
+            'require' => ['hyva-themes/magento2-default-theme' => '*'],
+        ]);
+
+        $this->assertTrue($this->scanner->getModuleInfo('/module')['isHyvaAware']);
+    }
 }