Revert "Address code review feedback: fix duplicate config, improve regex patterns, enhance security (#65)"

dermatz · dermatz · commit 4bf1568112f3 · 2026-01-12T10:58:08.000+01:00
This reverts commit f77c7ac.
diff --git a/docs/commands.md b/docs/commands.md
@@ -205,7 +205,7 @@ bin/magento mageforge:hyva:compatibility:check [options]
 **Options**:
 
 - `--show-all` / `-a` - Show all modules including compatible ones
-- `--third-party-only` / `-t` - Check only third-party modules (exclude Magento_* modules)
+- `--third-party-only` / `-t` - Check only third-party modules (exclude Magento\_\* modules)
 - `--include-vendor` - Include Magento core modules in scan (default: third-party only)
 - `--detailed` / `-d` - Show detailed file-level issues for incompatible modules
 
diff --git a/src/Console/Command/Hyva/CompatibilityCheckCommand.php b/src/Console/Command/Hyva/CompatibilityCheckCommand.php
@@ -96,7 +96,8 @@ private function runInteractiveMode(InputInterface $input, OutputInterface $outp
                 label: 'Select scan options',
                 options: [
                     'show-all' => 'Show all modules including compatible ones',
-                    'include-vendor' => 'Include vendor modules (default: excluded)',
+                    'incompatible-only' => 'Show only incompatible modules (default behavior)',
+                    'include-vendor' => 'Include Magento core modules (default: third-party only)',
                     'detailed' => 'Show detailed file-level issues with line numbers',
                 ],
                 default: [],
@@ -110,6 +111,7 @@ private function runInteractiveMode(InputInterface $input, OutputInterface $outp
 
             // Apply selected options to input
             $showAll = in_array('show-all', $selectedOptions);
+            $incompatibleOnly = in_array('incompatible-only', $selectedOptions);
             $includeVendor = in_array('include-vendor', $selectedOptions);
             $detailed = in_array('detailed', $selectedOptions);
             $thirdPartyOnly = false; // Not needed in interactive mode
@@ -119,11 +121,13 @@ private function runInteractiveMode(InputInterface $input, OutputInterface $outp
             $config = [];
             if ($showAll) {
                 $config[] = 'Show all modules';
+            } elseif ($incompatibleOnly) {
+                $config[] = 'Show incompatible only';
             } else {
                 $config[] = 'Show modules with issues';
             }
             if ($includeVendor) {
-                $config[] = 'Include vendor modules';
+                $config[] = 'Include Magento core';
             } else {
                 $config[] = 'Third-party modules only';
             }
@@ -133,8 +137,8 @@ private function runInteractiveMode(InputInterface $input, OutputInterface $outp
             $this->io->comment('Configuration: ' . implode(', ', $config));
             $this->io->newLine();
 
-            // Run scan with selected options
-            return $this->runScan($showAll, $thirdPartyOnly, $includeVendor, $detailed, false, $output);
+            // Run scan with selected options (pass incompatibleOnly flag)
+            return $this->runScan($showAll, $thirdPartyOnly, $includeVendor, $detailed, $incompatibleOnly, $output);
         } catch (\Exception $e) {
             $this->resetPromptEnvironment();
             $this->io->error('Interactive mode failed: ' . $e->getMessage());
@@ -172,11 +176,12 @@ private function runScan(
     ): int {
 
         // Determine filter logic for vendor and third-party modules:
-        // - By default (no flags): scan third-party modules excluding those in vendor/
-        // - With --include-vendor: include vendor modules in the scan
+        // - excludeVendor controls whether to scan modules in the vendor/ directory
+        // - By default (no flags): scan third-party modules including those in vendor/
+        // - With --include-vendor: scan everything including Magento_* core modules
         // - With --third-party-only: explicitly scan only third-party modules
         $scanThirdPartyOnly = $thirdPartyOnly || (!$includeVendor && !$thirdPartyOnly);
-        $excludeVendor = !$includeVendor;
+        $excludeVendor = false; // Always include vendor for third-party scanning
 
         // Run the compatibility check
         $results = $this->compatibilityChecker->check(
@@ -364,25 +369,9 @@ private function isInteractiveTerminal(OutputInterface $output): bool
             }
         }
 
-        // Additional check: detect if running in a proper TTY using safer methods
-        if (\function_exists('stream_isatty') && \defined('STDIN')) {
-            try {
-                return \stream_isatty(\STDIN);
-            } catch (\Throwable $e) {
-                // Fall through to next check
-            }
-        }
-
-        if (\function_exists('posix_isatty') && \defined('STDIN')) {
-            try {
-                return \posix_isatty(\STDIN);
-            } catch (\Throwable $e) {
-                // Fall through to default
-            }
-        }
-
-        // Conservative default if no TTY-detection functions are available
-        return false;
+        // Additional check: try to detect if running in a proper TTY
+        $sttyOutput = shell_exec('stty -g 2>/dev/null');
+        return !empty($sttyOutput);
     }
 
     /**
@@ -461,7 +450,7 @@ private function getServerVar(string $name): ?string
     private function setEnvVar(string $name, string $value): void
     {
         $this->secureEnvStorage[$name] = $value;
-        $_SERVER[$name] = $value;
+        putenv("$name=$value");
     }
 
     /**
diff --git a/src/Service/Hyva/IncompatibilityDetector.php b/src/Service/Hyva/IncompatibilityDetector.php
@@ -43,7 +43,7 @@ class IncompatibilityDetector
                 'severity' => self::SEVERITY_WARNING,
             ],
             [
-                'pattern' => '/(?:define|require)\s*\(\s*\[[^\]]*["\']mage\/[^"\']*["\']\s*[^\]]*\]/',
+                'pattern' => '/(?:define|require)\s*\(\s*\[[^\]]*["\']mage\/[^"\']*["\']/',
                 'description' => 'Magento RequireJS module reference',
                 'severity' => self::SEVERITY_CRITICAL,
             ],
@@ -65,7 +65,7 @@ class IncompatibilityDetector
                 'severity' => self::SEVERITY_CRITICAL,
             ],
             [
-                'pattern' => '/<referenceBlock\b[^>]*\bremove\s*=\s*"true"[^>]*>/s',
+                'pattern' => '/<referenceBlock.*remove="true">/',
                 'description' => 'Block removal (review for Hyvä compatibility)',
                 'severity' => self::SEVERITY_WARNING,
             ],
@@ -82,7 +82,7 @@ class IncompatibilityDetector
                 'severity' => self::SEVERITY_CRITICAL,
             ],
             [
-                'pattern' => '/\$\([^)]*\)\s*\.(on|click|ready|change|keyup|keydown|submit|ajax|each|css|hide|show|addClass|removeClass|toggleClass|append|prepend|html|text|val|attr|prop|data|trigger|find|parent|children)\s*\(/',
+                'pattern' => '/\$\(.*\)\..*\(/',
                 'description' => 'jQuery DOM manipulation',
                 'severity' => self::SEVERITY_WARNING,
             ],
diff --git a/src/Service/Hyva/ModuleScanner.php b/src/Service/Hyva/ModuleScanner.php
@@ -107,7 +107,31 @@ private function findRelevantFiles(string $directory): array
     }
 
     /**
-     * Check if module has Hyvä compatibility package
+     * Check if module has Hyvä compatibility package based on composer data
+     *
+     * @param array $composerData Parsed composer.json data
+     */
+    private function isHyvaCompatibilityPackage(array $composerData): bool
+    {
+        // Check if this IS a Hyvä compatibility package
+        $packageName = $composerData['name'] ?? '';
+        if (str_starts_with($packageName, 'hyva-themes/') && str_contains($packageName, '-compat')) {
+            return true;
+        }
+
+        // Check dependencies for Hyvä packages
+        $requires = $composerData['require'] ?? [];
+        foreach ($requires as $package => $version) {
+            if (str_starts_with($package, 'hyva-themes/')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if module has Hyvä compatibility package (public wrapper)
      */
     public function hasHyvaCompatibilityPackage(string $modulePath): bool
     {
@@ -125,21 +149,7 @@ public function hasHyvaCompatibilityPackage(string $modulePath): bool
                 return false;
             }
 
-            // Check if this IS a Hyvä compatibility package
-            $packageName = $composerData['name'] ?? '';
-            if (str_starts_with($packageName, 'hyva-themes/') && str_contains($packageName, '-compat')) {
-                return true;
-            }
-
-            // Check dependencies for Hyvä packages
-            $requires = $composerData['require'] ?? [];
-            foreach ($requires as $package => $version) {
-                if (str_starts_with($package, 'hyva-themes/')) {
-                    return true;
-                }
-            }
-
-            return false;
+            return $this->isHyvaCompatibilityPackage($composerData);
         } catch (\Exception $e) {
             // Log error when debugging to help identify JSON or file read issues
             if (getenv('MAGEFORGE_DEBUG')) {
diff --git a/src/etc/di.xml b/src/etc/di.xml
@@ -3,6 +3,39 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"
 >
+      <type name="Magento\Framework\Console\CommandList">
+            <arguments>
+                  <argument
+                        name="commands"
+                        xsi:type="array"
+                  >
+                        <item name="mageforge_system_version"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\System\VersionCommand</item>
+                        <item name="mageforge_system_check"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\System\CheckCommand</item>
+                        <item name="mageforge_theme_list"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\Theme\ListCommand</item>
+                        <item name="mageforge_theme_build"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\Theme\BuildCommand</item>
+                        <item name="mageforge_theme_watch"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\Theme\WatchCommand</item>
+                        <item name="mageforge_hyva_compatibility_check"
+                              xsi:type="object"
+                        >
+                              OpenForgeProject\MageForge\Console\Command\Hyva\CompatibilityCheckCommand</item>
+                  </argument>
+            </arguments>
+      </type>
     <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument
@@ -27,9 +60,6 @@
                 <item name="mageforge_static_clean"
                       xsi:type="object"
                       >OpenForgeProject\MageForge\Console\Command\Static\CleanCommand</item>
-                <item name="mageforge_hyva_compatibility_check"
-                      xsi:type="object"
-                      >OpenForgeProject\MageForge\Console\Command\Hyva\CompatibilityCheckCommand</item>
             </argument>
         </arguments>
     </type>
